summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-06-06 15:28:51 +0000
committerjlam <jlam@pkgsrc.org>2006-06-06 15:28:51 +0000
commit3058ace76fb2a626712182cbb8d1c4ad1c522563 (patch)
treebe674509e8d58469464756dfb6ad0bf39e42afa9 /mk/install
parent25020695c08c46417b890ec4e950d67c69bed90a (diff)
downloadpkgsrc-3058ace76fb2a626712182cbb8d1c4ad1c522563.tar.gz
Move some variable definitions out of bsd.prefs.mk and back into
bsd.pkg.mk. They didn't actually need to be defined in bsd.prefs.mk, just somewhere before the "main" bsd.<phase>.mk files were included. This moves some conditional (?=) definitions back into bsd.pkg.mk so they won't conflict with any conditional definitions in package Makefiles. This should fix the "checksum" problems in lang/php-gd as noted here: http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html where EXTRACT_SUFX had the wrong value due to the order in while *.mk files were included.
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/bsd.install-vars.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/bsd.install-vars.mk b/mk/install/bsd.install-vars.mk
index ec6c429021e..a00828d7dee 100644
--- a/mk/install/bsd.install-vars.mk
+++ b/mk/install/bsd.install-vars.mk
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.install-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
#
-# This Makefile fragment is included by bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.install.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.install.mk is included.
#
# If a package sets INSTALLATION_DIRS, then it's known to pre-create