set libpng prefix to staging_dir/usr

SVN-Revision: 811
This commit is contained in:
Felix Fietkau 2005-05-07 23:08:46 +00:00
parent 02b82f795e
commit 2d8e484bec

View file

@ -32,16 +32,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--prefix=/usr \ --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 \
--with-zlib=$(STAGING_DIR)/usr/ \ --with-zlib=$(STAGING_DIR)/usr/ \
$(DISABLE_NLS) \ $(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 $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.libs/libpng.so
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(STAGING_DIR)" \ install
install-libLTLIBRARIES install-includeHEADERS install-binSCRIPTS # DESTDIR="$(STAGING_DIR)" \
# install-libLTLIBRARIES install-includeHEADERS install-binSCRIPTS
$(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libpng.so $(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) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)