diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-07 23:08:46 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-05-07 23:08:46 +0000 |
| commit | ff9ba1a7a4c9d7fd922268e7bcdd7fb0bec6bcb8 (patch) | |
| tree | 3d5c1b6d625760d28dcdc3ce9626cefe02398fc5 | |
| parent | ec19f0ee25cb3273a0d224c545b7668ccee39e4a (diff) | |
set libpng prefix to staging_dir/usr
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@811 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/libpng/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/openwrt/package/libpng/Makefile b/openwrt/package/libpng/Makefile index a4971ddd54..d39dea96cb 100644 --- a/openwrt/package/libpng/Makefile +++ b/openwrt/package/libpng/Makefile @@ -32,16 +32,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=/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 \ + --prefix=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr/ \ $(DISABLE_NLS) \ ) @@ -55,8 +46,9 @@ $(PKG_BUILD_DIR)/.libs/libpng.so: $(PKG_BUILD_DIR)/.configured $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.libs/libpng.so $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ - install-libLTLIBRARIES install-includeHEADERS install-binSCRIPTS + install +# DESTDIR="$(STAGING_DIR)" \ +# install-libLTLIBRARIES install-includeHEADERS install-binSCRIPTS $(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libpng.so $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) |