summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerh <erh@pkgsrc.org>2003-12-03 18:13:28 +0000
committererh <erh@pkgsrc.org>2003-12-03 18:13:28 +0000
commit5522ce89d047592beafd68cb02ed40c478e336fb (patch)
treea8c936ef828941aa18e2d974c41ed25ea9fc86cc
parent8a217f07c822730a66873196a122d222be4c5e1f (diff)
downloadpkgsrc-5522ce89d047592beafd68cb02ed40c478e336fb.tar.gz
If PKGMAKECONF is defined, use it to set MAKECONF instead of "/dev/null".
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index f6a3e767bf3..cfb0a32fd48 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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)