summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-03-22 22:37:29 +0000
committerChris Larson <clarson@kergoth.com>2004-03-22 22:37:29 +0000
commitf249735ad71fd5f13bfd295c55e1e0d596a1dbff (patch)
tree93735f3e25beab7ac8bf066c504df17b244db4eb /zlib
parent11ebfcef190cf217f67fa2b79adee0f58f9718f3 (diff)
Another pass of .oe cleanups.
BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ
Diffstat (limited to 'zlib')
-rw-r--r--zlib/zlib_1.1.4.oe10
1 files changed, 5 insertions, 5 deletions
diff --git a/zlib/zlib_1.1.4.oe b/zlib/zlib_1.1.4.oe
index e47650ff17..b4c312a84f 100644
--- a/zlib/zlib_1.1.4.oe
+++ b/zlib/zlib_1.1.4.oe
@@ -6,7 +6,7 @@ RDEPENDS = "libc6"
SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz"
DEPENDS = "virtual/libc"
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}/zlib-${PV}"
export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
LDFLAGS_append = " -L. -lz"
@@ -16,13 +16,13 @@ EXTRA_OEMAKE = ""
do_compile() {
./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
- oe_runmake -e MAKEFLAGS="" libz.so.1.1.4 libz.a
+ oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
}
do_stage() {
- install -m 0644 zlib.h ${STAGING_DIR}/target/include/zlib.h
- install -m 0644 zconf.h ${STAGING_DIR}/target/include/zconf.h
- install -m 0755 libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1.1.4
+ install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
+ install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
+ install -m 0755 libz.so.${PV} ${STAGING_LIBDIR}/libz.so.${PV}
install -m 0755 libz.a ${STAGING_LIBDIR}/libz.a
ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1
ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so