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/pcre | |
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/pcre')
-rw-r--r-- | package/pcre/pcre.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 290e53431..d2a13318f 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -13,14 +13,20 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y) PCRE_CONF_OPT = --disable-cpp endif -$(eval $(call AUTOTARGETS,package,pcre)) - -$(PCRE_HOOK_POST_INSTALL): $(PCRE_TARGET_INSTALL_TARGET) +define PCRE_STAGING_PCRE_CONFIG_FIXUP $(SED) 's,^prefix=.*,prefix=$(STAGING_DIR)/usr,' \ -e 's,^exec_prefix=.*,exec_prefix=$(STAGING_DIR)/usr,' \ $(STAGING_DIR)/usr/bin/pcre-config - rm -rf $(TARGET_DIR)/usr/share/doc/pcre -ifneq ($(BR2_HAVE_DEVFILES),y) +endef + +PCRE_POST_INSTALL_STAGING_HOOKS += PCRE_STAGING_PCRE_CONFIG_FIXUP + +define PCRE_TARGET_REMOVE_PCRE_CONFIG rm -f $(TARGET_DIR)/usr/bin/pcre-config +endef + +ifneq ($(BR2_HAVE_DEVFILES),y) +PCRE_POST_INSTALL_TARGET_HOOKS += PCRE_TARGET_REMOVE_PCRE_CONFIG endif - touch $@ + +$(eval $(call AUTOTARGETS,package,pcre)) |