diff options
| author | Nicolas Thill <nico@openwrt.org> | 2006-02-01 15:13:01 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2006-02-01 15:13:01 +0000 |
| commit | 8966d3e9406a91e923a5565a3c6342050965fc0b (patch) | |
| tree | 244882c2bb5c8cd455c183e886dcdef4ef13ef62 | |
| parent | a73057238b4e55edea1a9dad2dcfe99c66cd214e (diff) | |
| download | upstream-8966d3e9406a91e923a5565a3c6342050965fc0b.tar.gz upstream-8966d3e9406a91e923a5565a3c6342050965fc0b.tar.bz2 upstream-8966d3e9406a91e923a5565a3c6342050965fc0b.zip | |
remove references to /usr in libpng*-config, standardize.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3109 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libpng/Makefile | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/package/libpng/Makefile b/package/libpng/Makefile index f6541cb9d9..228255c301 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -22,31 +22,31 @@ $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --with-zlib=$(STAGING_DIR)/usr/ \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --enable-shared \ + --enable-static \ + --with-zlib=$(STAGING_DIR)/usr/ \ ) touch $@ @@ -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/ mkdir -p $(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 |