diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-17 19:15:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-17 19:15:35 +0000 |
| commit | 5bcd5a4093628b813b82e3e559c8e34ab307a34f (patch) | |
| tree | dcf47d2a6533f6371df4cfe843a197e6c35d02e4 | |
| parent | 957792d48dae03b703ec192f65553e45a14c282f (diff) | |
| download | pkgsrc-5bcd5a4093628b813b82e3e559c8e34ab307a34f.tar.gz | |
Ensure that the PROTECT and UNPROTECT variables are clobbered by properly
ordering them and using += instead of an accidental = . This should fix
pkg/18324 by John Kohl <jtk@kolvir.arlington.ma.us>.
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 39c2a53f668..d499ee94ee8 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.20 2002/09/17 06:20:14 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.21 2002/09/17 19:15:35 jlam Exp $ # # An example package buildlink2.mk file: # @@ -226,13 +226,16 @@ _BLNK_TRANSFORM+= r:-R${_localbase_} # key directories from any argument filtering, as they may be # subdirectories of ${LOCALBASE}, /usr/pkg, or /usr/local. # -_BLNK_PROTECT_SED= -e "s|${_PKGSRCDIR}|_pKgSrCdIr_|g" +_BLNK_PROTECT_SED= # empty +_BLNK_UNPROTECT_SED= # empty + +_BLNK_PROTECT_SED+= -e "s|${_PKGSRCDIR}|_pKgSrCdIr_|g" _BLNK_PROTECT_SED+= -e "s|${BUILDLINK_DIR}|_bUiLdLiNk_dIr_|g" .if defined(ZOULARISBASE) && (${ZOULARISBASE} != ${LOCALBASE}) _BLNK_PROTECT_SED+= -e "s|${ZOULARISBASE}|_zOuLaRiSbAsE_|g" _BLNK_UNPROTECT_SED+= -e "s|_zOuLaRiSbAsE_|${ZOULARISBASE}|g" .endif -_BLNK_UNPROTECT_SED= -e "s|_bUiLdLiNk_dIr_|${BUILDLINK_DIR}|g" +_BLNK_UNPROTECT_SED+= -e "s|_bUiLdLiNk_dIr_|${BUILDLINK_DIR}|g" _BLNK_UNPROTECT_SED+= -e "s|_pKgSrCdIr_|${_PKGSRCDIR}|g" # # Create _BLNK_TRANSFORM_SED.{1,2,3} from _BLNK_TRANSFORM. We must use |