From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 7 May 2005 23:10:47 +0000 (+0000)
Subject: set libgd prefix to staging_dir/usr
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/7c01b236ad21ede4a77fc1718823612224a46286?ds=sidebyside

set libgd prefix to staging_dir/usr


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@812 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile
index 87fb49ba9..e391d030a 100644
--- a/openwrt/package/libgd/Makefile
+++ b/openwrt/package/libgd/Makefile
@@ -36,15 +36,6 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
 			--host=$(GNU_TARGET_NAME) \
 			--build=$(GNU_HOST_NAME) \
 			--prefix="$(STAGING_DIR)/usr" \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--datadir=/usr/share \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man \
-			--localstatedir=/var \
-			--sysconfdir=/etc \
 			--disable-rpath \
 			--without-x \
 			--with-png=$(STAGING_DIR)/usr \
@@ -62,9 +53,7 @@ $(PKG_BUILD_DIR)/.libs/libgd.so: $(PKG_BUILD_DIR)/.configured
 
 $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.libs/libgd.so
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-	DESTDIR="$(STAGING_DIR)" \
 	install
-	rm -f $(STAGING_DIR)/usr/lib/libgd*.la
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libgd.so
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libgd.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)