diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-06 15:28:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-06 15:28:51 +0000 |
| commit | 3058ace76fb2a626712182cbb8d1c4ad1c522563 (patch) | |
| tree | be674509e8d58469464756dfb6ad0bf39e42afa9 /mk/bsd.prefs.mk | |
| parent | 25020695c08c46417b890ec4e950d67c69bed90a (diff) | |
| download | pkgsrc-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/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c6c509fbb62..cb57fa28fc4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.225 2006/06/06 06:30:29 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.226 2006/06/06 15:28:52 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -502,9 +502,11 @@ MAKEFLAGS+= _PKGSRCDIR=${_PKGSRCDIR:Q} .endif PKGSRCDIR= ${_PKGSRCDIR} +DISTDIR?= ${PKGSRCDIR}/distfiles PACKAGES?= ${PKGSRCDIR}/packages TEMPLATES?= ${PKGSRCDIR}/templates +PATCHDIR?= ${.CURDIR}/patches SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR} @@ -551,17 +553,12 @@ PREPEND_PATH+= ${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin # Wrapper framework definitions .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk" +# Package system flavor definitions +.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk" + # Make variable definitions cache .include "${PKGSRCDIR}/mk/bsd.makevars.mk" -.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk" -.include "${PKGSRCDIR}/mk/check/bsd.check-vars.mk" -.include "${PKGSRCDIR}/mk/depends/bsd.depends-vars.mk" -.include "${PKGSRCDIR}/mk/fetch/bsd.fetch-vars.mk" -.include "${PKGSRCDIR}/mk/extract/bsd.extract-vars.mk" -.include "${PKGSRCDIR}/mk/patch/bsd.patch-vars.mk" -.include "${PKGSRCDIR}/mk/install/bsd.install-vars.mk" - USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc \ sed:pkgsrc tr:pkgsrc uname:pkgsrc |