aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-01 08:36:11 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-01 08:36:11 +0000
commit888547638ef9d5068699ea48b091a329cbf1b1f7 (patch)
treecb96f3b5c61634886fda8c9cedb0004111147c47 /package
parentfc58d10c2c3e3c4e7b9ae8554e6a2fca02566b4f (diff)
downloadbuildroot-888547638ef9d5068699ea48b091a329cbf1b1f7.tar.gz
buildroot-888547638ef9d5068699ea48b091a329cbf1b1f7.tar.bz2
Cleanup libpng, use usr/lib
Diffstat (limited to 'package')
-rw-r--r--package/libpng/libpng.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 4e76db0209..45cca0378d 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -62,7 +62,7 @@ $(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured
$(MAKE) -C $(LIBPNG_DIR)
touch $@
-$(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled
+$(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install;
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
@@ -72,9 +72,9 @@ $(STAGING_DIR)/lib/libpng.so: $(LIBPNG_DIR)/.compiled
$(STAGING_DIR)/usr/bin/libpng12-config
touch -c $@
-$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/lib/libpng.so
+$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
cp -dpf $(STAGING_DIR)/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng.so
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libpng*
png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so