mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
remove references to /usr in libpng*-config, standardize.
SVN-Revision: 3109
This commit is contained in:
parent
d5cba867b5
commit
e867e35b21
@ -22,8 +22,8 @@ $(PKG_BUILD_DIR)/.configured:
|
|||||||
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
|
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
|
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
||||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
|
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
|
||||||
./configure \
|
./configure \
|
||||||
--target=$(GNU_TARGET_NAME) \
|
--target=$(GNU_TARGET_NAME) \
|
||||||
--host=$(GNU_TARGET_NAME) \
|
--host=$(GNU_TARGET_NAME) \
|
||||||
@ -74,6 +74,8 @@ $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built
|
|||||||
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(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
|
mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
|
||||||
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
|
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
|
||||||
|
$(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config
|
||||||
|
touch $@
|
||||||
|
|
||||||
install-dev: $(STAGING_DIR)/usr/lib/libpng.so
|
install-dev: $(STAGING_DIR)/usr/lib/libpng.so
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user