From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 19 May 2005 19:18:53 +0000 (+0000)
Subject: fix libpng
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5f8904f29d997013e6d36d2d83a4fdb2da762ca9;p=openwrt%2Fstaging%2Fansuel.git

fix libpng

SVN-Revision: 958
---

diff --git a/openwrt/package/libpng/Makefile b/openwrt/package/libpng/Makefile
index 6fb1c18033..f7f6c9faa8 100644
--- a/openwrt/package/libpng/Makefile
+++ b/openwrt/package/libpng/Makefile
@@ -12,7 +12,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-config.tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -25,53 +24,30 @@ $(PKG_BUILD_DIR)/.configured:
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-		  --enable-shared \
-		  --enable-static \
-		  --with-zlib=$(STAGING_DIR)/usr/ \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--prefix=$(STAGING_DIR)/usr \
+			--with-zlib=$(STAGING_DIR)/usr/ \
+			--enable-shared \
+			--enable-static \
+			--with-zlib=$(STAGING_DIR)/usr/ \
+			$(DISABLE_NLS) \
+			$(DISABLE_LARGEFILE) \
 	)
 	touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/.built:
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+	$(MAKE) -C $(PKG_BUILD_DIR) all
 
 $(IPKG_LIBPNG):
 	install -d -m0755 $(IDIR_LIBPNG)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/
+	cp -fpR $(PKG_BUILD_DIR)/.libs/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBPNG)
 	$(IPKG_BUILD) $(IDIR_LIBPNG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built
-	mkdir -p $(STAGING_DIR)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(MAKE) -C $(PKG_BUILD_DIR) all
 
 install-dev: $(STAGING_DIR)/usr/lib/libpng.so