diff options
| author | jlam <jlam> | 2004-09-07 00:14:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-09-07 00:14:13 +0000 |
| commit | db317bfd0282609d15d8571a68baaec926166e0e (patch) | |
| tree | 21a5616703e9dbaadd9d608e0fcf31470afd9fef /mk | |
| parent | 5a6e155e15b33978de86bbf88fba3c24600c17d1 (diff) | |
| download | pkgsrc-db317bfd0282609d15d8571a68baaec926166e0e.tar.gz | |
Use UNWRAP_{PATTERNS,FILES} instead of UNBUILDLINK_{PATTERNS,FILES}. This
will help to minimize diffs for packages between the forthcoming
pkgsrc-2004Q3 branch and the HEAD after the integration of the wrapper
script framework.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 1c0f409fe81..8c14edebd07 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.151 2004/08/27 08:38:22 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.152 2004/09/07 00:14:13 jlam Exp $ # # An example package buildlink3.mk file: # @@ -1008,7 +1008,7 @@ _BLNK_UNTRANSFORM_SED+= -f ${_BLNK_UNTRANSFORM_SEDFILE} # stripped out of them. # UNBUILDLINK_PATTERNS?= # empty -_UNBUILDLINK_PATTERNS= ${UNBUILDLINK_PATTERNS} +_UNBUILDLINK_PATTERNS= ${UNWRAP_PATTERNS} _UNBUILDLINK_PATTERNS+= *-config _UNBUILDLINK_PATTERNS+= *Conf.sh _UNBUILDLINK_PATTERNS+= *.pc @@ -1016,7 +1016,7 @@ _UNBUILDLINK_PATTERNS_FIND= \ \( ${_UNBUILDLINK_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \) UNBUILDLINK_FILES?= # empty _UNBUILDLINK_FILES= \ - ${UNBUILDLINK_FILES} \ + ${UNWRAP_FILES} \ `${FIND} . ${_UNBUILDLINK_PATTERNS_FIND} -print | ${SED} -e 's|^\./||' | ${SORT} -u` # # When "unbuildlinkifying" a file, we must remove references to the |