projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02b82f7
)
set libpng prefix to staging_dir/usr
author
Felix Fietkau
<nbd@openwrt.org>
Sat, 7 May 2005 23:08:46 +0000
(23:08 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sat, 7 May 2005 23:08:46 +0000
(23:08 +0000)
SVN-Revision: 811
openwrt/package/libpng/Makefile
patch
|
blob
|
history
diff --git
a/openwrt/package/libpng/Makefile
b/openwrt/package/libpng/Makefile
index a4971ddd54e7ed221cfd3b255f0045a929bb7efa..d39dea96cb46e5e429ab2d133603063b21cb355d 100644
(file)
--- 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) \
--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) \
)
--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) \
$(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)
$(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)