pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk If PKGMAKECONF is defined, use it to set MAKECONF i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a18effa6ca7
branches:  trunk
changeset: 464050:9a18effa6ca7
user:      erh <erh%pkgsrc.org@localhost>
date:      Wed Dec 03 18:13:28 2003 +0000

description:
If PKGMAKECONF is defined, use it to set MAKECONF instead of "/dev/null".

diffstat:

 mk/bsd.pkg.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 18e4c62495f7 -r 9a18effa6ca7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Dec 03 17:57:33 2003 +0000
+++ b/mk/bsd.pkg.mk     Wed Dec 03 18:13:28 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1308 2003/12/02 23:08:24 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1309 2003/12/03 18:13:28 erh Exp $
 #
 # This file is in the public domain.
 #
@@ -23,7 +23,11 @@
 ##### Prevent /etc/mk.conf from being included by a distribution's BSD-style
 ##### Makefiles.  We really don't want to pick up settings that are used by
 ##### builds in /usr/src, e.g. DESTDIR.
+.if defined(PKGMAKECONF)
+MAKE_ENV+=     MAKECONF=${PKGMAKECONF}
+.else
 MAKE_ENV+=     MAKECONF=/dev/null
+.endif
 
 ##### Pass information about desired toolchain to package build.
 .if defined(USETOOLS)



Home | Main Index | Thread Index | Old Index