diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:25:32 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:36:00 +0200 |
| commit | 1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75 (patch) | |
| tree | b3b4fb6139799602676e100126c19055b18ac7f0 /package/libpng/libpng.mk | |
| parent | c106fdbd100f36fe3329360af8f656566937f00a (diff) | |
| parent | ae2be8dbc36293d8243baf2b13ad17a47738d6d3 (diff) | |
Merge branch 'for-2010.11/remove-oldstyle-hooks' of git://git.busybox.net/~tpetazzoni/git/buildroot
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libpng/libpng.mk')
| -rw-r--r-- | package/libpng/libpng.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index a81d9513c..5608f4fce 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -14,14 +14,15 @@ LIBPNG_DEPENDENCIES = host-pkg-config zlib HOST_LIBPNG_CONF_OPT = --without-libpng-compat HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib -$(eval $(call AUTOTARGETS,package,libpng)) -$(eval $(call AUTOTARGETS,package,libpng,host)) - -$(LIBPNG_HOOK_POST_INSTALL): +define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ $(STAGING_DIR)/usr/bin/libpng12-config - touch $@ +endef +LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP + +$(eval $(call AUTOTARGETS,package,libpng)) +$(eval $(call AUTOTARGETS,package,libpng,host)) |