From 41bb50859e783b8bd4119f89dfc804da8f3e5489 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 6 Jun 2006 15:28:51 +0000 Subject: 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..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. --- mk/install/bsd.install-vars.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mk/install') 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 -- cgit v1.2.3