From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/zlib/zlib_1.1.4.bb | 6 +++--- packages/zlib/zlib_1.2.2.bb | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/zlib') diff --git a/packages/zlib/zlib_1.1.4.bb b/packages/zlib/zlib_1.1.4.bb index cf8990eb60..ac90365322 100644 --- a/packages/zlib/zlib_1.1.4.bb +++ b/packages/zlib/zlib_1.1.4.bb @@ -28,7 +28,7 @@ do_stage() { } do_install() { - install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir} - oe_runmake "prefix=${D}/${prefix}" "includedir=${D}/${includedir}" \ - "libdir=${D}/${libdir}" install + install -d ${D}${prefix} ${D}${includedir} ${D}${libdir} + oe_runmake "prefix=${D}${prefix}" "includedir=${D}${includedir}" \ + "libdir=${D}${libdir}" install } diff --git a/packages/zlib/zlib_1.2.2.bb b/packages/zlib/zlib_1.2.2.bb index 94270a383d..385fbbf57c 100644 --- a/packages/zlib/zlib_1.2.2.bb +++ b/packages/zlib/zlib_1.2.2.bb @@ -27,10 +27,10 @@ do_stage() { } do_install() { - install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir} - oe_runmake "prefix=${D}/${prefix}" \ - "exec_prefix=${D}/${exec_prefix}" \ - "man3dir=${D}/${mandir}/man3" \ - "includedir=${D}/${includedir}" \ - "libdir=${D}/${libdir}" install + install -d ${D}${prefix} ${D}${includedir} ${D}${libdir} + oe_runmake "prefix=${D}${prefix}" \ + "exec_prefix=${D}${exec_prefix}" \ + "man3dir=${D}${mandir}/man3" \ + "includedir=${D}${includedir}" \ + "libdir=${D}${libdir}" install } -- cgit v1.2.3