diff options
| author | Rene Wagner <rw@handhelds.org> | 2004-08-18 19:57:14 +0000 |
|---|---|---|
| committer | Rene Wagner <rw@handhelds.org> | 2004-08-18 19:57:14 +0000 |
| commit | 2da813081f31ba2071b423aaab1be86e103d6e23 (patch) | |
| tree | 385b7839e17e486c991f39ba49646526bcc01552 | |
| parent | de483831517a3d2519ddceee88677fbca76c3e23 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into sugarcube.dyndns.org:/home/oe/oe/packages
2004/08/18 21:56:48+02:00 dyndns.org!reenoo
gsl, fltk: inherit binconfig; remove now obsolete sed magic
BKrev: 4123b49a1Esor4LbYwsXVmIFDhRJJQ
| -rw-r--r-- | fltk/fltk_1.2+cvs20040806.oe | 4 | ||||
| -rw-r--r-- | gsl/gsl_1.4.oe | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/fltk/fltk_1.2+cvs20040806.oe b/fltk/fltk_1.2+cvs20040806.oe index bd6b5a671f..bbba0ff4a6 100644 --- a/fltk/fltk_1.2+cvs20040806.oe +++ b/fltk/fltk_1.2+cvs20040806.oe @@ -11,7 +11,7 @@ SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/fltk;module=fltk;method= file://autotools.patch;patch=1" S="${WORKDIR}/fltk" -inherit autotools +inherit autotools binconfig do_configure_prepend() { autoconf @@ -37,8 +37,6 @@ do_stage() { includedir=${STAGING_INCDIR} \ libdir=${STAGING_LIBDIR} \ datadir=${STAGING_DATADIR} - cat fltk-config | sed -e "s,includedir=/usr/include,includedir=${STAGING_INCDIR}," \ - | sed -e "s,libdir=/usr/lib,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/fltk-config } python populate_packages_prepend () { diff --git a/gsl/gsl_1.4.oe b/gsl/gsl_1.4.oe index 1aebea1de5..2747cdf827 100644 --- a/gsl/gsl_1.4.oe +++ b/gsl/gsl_1.4.oe @@ -5,7 +5,7 @@ LICENSE = "GPL" SRC_URI = "http://www.mirror.ac.uk/sites/sources.redhat.com/pub/gsl/gsl-${PV}.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig binconfig LEAD_SONAME = "libgsl.so" @@ -16,8 +16,4 @@ do_stage() { install -d ${STAGING_INCDIR}/gsl install -m 0644 .install/usr/include/gsl/* ${STAGING_INCDIR}/gsl - - cat gsl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR} -I${STAGING_INCDIR}/python2.3," \ - | sed -e "s,-L/usr/lib,-L${STAGING_LIBDIR}," > ${STAGING_BINDIR}/gsl-config - chmod a+rx ${STAGING_BINDIR}/gsl-config } |