diff options
| author | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-12-24 13:40:10 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-12-24 13:40:10 +0100 |
| commit | b3f34edc4ea201c7e4c8ead40fb55ff24e027ccc (patch) | |
| tree | 13ac02b1ffbeafce3b9dc2a1b943d4ccaca75ccf | |
| parent | 5dc62b31653d706327387ca1a1bc3178ffdb122a (diff) | |
| download | embtoolkit-b3f34edc4ea201c7e4c8ead40fb55ff24e027ccc.tar.gz embtoolkit-b3f34edc4ea201c7e4c8ead40fb55ff24e027ccc.tar.bz2 embtoolkit-b3f34edc4ea201c7e4c8ead40fb55ff24e027ccc.tar.xz | |
packages: libpng: adapt pkgconfig files for cross compile
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
| -rw-r--r-- | packages/graphics/libpng/libpng.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk index c8b0f28..d3ca55b 100644 --- a/packages/graphics/libpng/libpng.mk +++ b/packages/graphics/libpng/libpng.mk @@ -42,7 +42,7 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \ $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.pkgconfigpatched + $(Q)$(MAKE) pkgconfig_files_adapt $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libpng-configpatched @touch $@ @@ -73,21 +73,6 @@ $(LIBPNG_BUILD_DIR)/.libpng-configpatched: > libpng-config.new;\ cp libpng-config.new libpng-config; rm libpng-config.new -$(LIBPNG_BUILD_DIR)/.pkgconfigpatched: -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)cd $(SYSROOT)/usr/lib32/pkgconfig; \ - cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(SYSROOT)\/usr;' \ - -e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \ - > libpng.pc.new;\ - cp libpng.pc.new libpng.pc; rm libpng.pc.new -else - $(Q)cd $(SYSROOT)/usr/lib/pkgconfig; \ - cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(SYSROOT)\/usr;' \ - -e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \ - > libpng.pc.new;\ - cp libpng.pc.new libpng.pc; rm libpng.pc.new -endif - libpng_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup libpng-$(LIBPNG_VERSION)...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBPNG_BINS) |