pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Make PKGSRCDIR a read-only value. This avoids prob...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0396d513708
branches:  trunk
changeset: 481561:d0396d513708
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Oct 07 13:42:26 2004 +0000

description:
Make PKGSRCDIR a read-only value.  This avoids problems where the user
decides to set PKGSRCDIR to a relative path as seen in several old PRs
and which prompted the original switch to make PKGSRCDIR private in
revision 1.881 of bsd.pkg.mk.

diffstat:

 mk/bsd.prefs.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r cbe1692b15a8 -r d0396d513708 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Oct 07 13:38:29 2004 +0000
+++ b/mk/bsd.prefs.mk   Thu Oct 07 13:42:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.172 2004/10/07 03:03:09 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.173 2004/10/07 13:42:26 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -464,10 +464,11 @@
 .endif
 
 PKGPATH?=              ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
-.if !defined(PKGSRCDIR)
-PKGSRCDIR!=            cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
-MAKEFLAGS+=            PKGSRCDIR=${PKGSRCDIR:Q}
+.if !defined(_PKGSRCDIR)
+_PKGSRCDIR!=           cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
+MAKEFLAGS+=            _PKGSRCDIR=${_PKGSRCDIR:Q}
 .endif
+PKGSRCDIR=             ${_PKGSRCDIR}
 
 DISTDIR?=              ${PKGSRCDIR}/distfiles
 PACKAGES?=             ${PKGSRCDIR}/packages



Home | Main Index | Thread Index | Old Index