diff options
author | wiz <wiz@pkgsrc.org> | 2014-07-21 12:10:40 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-07-21 12:10:40 +0000 |
commit | 788929f3364fdd6cb325ba847a2aec6ace331a5b (patch) | |
tree | 7677d1b7d921fd1a958f192a44452b0f7a81c762 | |
parent | d2e9ac884d2f9f071f8447a3c8aa291794452d63 (diff) | |
download | pkgsrc-788929f3364fdd6cb325ba847a2aec6ace331a5b.tar.gz |
iRename SUBST_CLASS to _pkgconfig (adding a '_') to avoid conflicts
with packager-chosen prefixes (as with portaudio-devel recently).
-rw-r--r-- | mk/configure/pkg-config-override.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/configure/pkg-config-override.mk b/mk/configure/pkg-config-override.mk index 418ccd696b2..fe4d6ca9708 100644 --- a/mk/configure/pkg-config-override.mk +++ b/mk/configure/pkg-config-override.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-config-override.mk,v 1.3 2007/07/25 18:07:34 rillig Exp $ +# $NetBSD: pkg-config-override.mk,v 1.4 2014/07/21 12:10:40 wiz Exp $ # Package-settable variables: # @@ -30,15 +30,15 @@ PKGCONFIG_OVERRIDE_SED= \ '/^Libs:.*[ ]/s|-L\([ ]*[^ ]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g' PKGCONFIG_OVERRIDE_STAGE?= pre-configure -SUBST_CLASSES+= pkgconfig +SUBST_CLASSES+= _pkgconfig . if ${PKGCONFIG_OVERRIDE_STAGE} == "pre-configure" -SUBST_STAGE.pkgconfig= do-configure-pre-hook +SUBST_STAGE._pkgconfig= do-configure-pre-hook . elif ${PKGCONFIG_OVERRIDE_STAGE} == "post-configure" -SUBST_STAGE.pkgconfig= do-configure-post-hook +SUBST_STAGE._pkgconfig= do-configure-post-hook . else -SUBST_STAGE.pkgconfig= ${PKGCONFIG_OVERRIDE_STAGE} +SUBST_STAGE._pkgconfig= ${PKGCONFIG_OVERRIDE_STAGE} . endif -SUBST_MESSAGE.pkgconfig= Adding run-time search paths to pkg-config files. -SUBST_FILES.pkgconfig= ${PKGCONFIG_OVERRIDE:S/^${WRKSRC}\///} -SUBST_SED.pkgconfig= ${PKGCONFIG_OVERRIDE_SED} +SUBST_MESSAGE._pkgconfig= Adding run-time search paths to pkg-config files. +SUBST_FILES._pkgconfig= ${PKGCONFIG_OVERRIDE:S/^${WRKSRC}\///} +SUBST_SED._pkgconfig= ${PKGCONFIG_OVERRIDE_SED} .endif |