summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-01-07 00:57:36 +0000
committerrillig <rillig@pkgsrc.org>2007-01-07 00:57:36 +0000
commitb69640f761b7ea601da6954107839d2f3f643b12 (patch)
treeb1453a606db9507d05c98ea06ce315d0f1f088f9
parentabc37f3fbec9e64bd0199ccad6d2557a1563c99f (diff)
downloadpkgsrc-b69640f761b7ea601da6954107839d2f3f643b12.tar.gz
The tool definitions must come before including bsd.prefs.mk. Pointed
out by wiz.
-rw-r--r--Makefile16
-rw-r--r--mk/misc/toplevel.mk17
2 files changed, 17 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index cf5247c710d..f9a7682d2e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/01/06 17:10:42 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2007/01/07 00:57:36 rillig Exp $
#
# This is the top-level Makefile of pkgsrc. It contains a list of the
# categories of packages, as well as some targets that operate on the
@@ -23,6 +23,20 @@
# mk/misc/toplevel.mk
#
+# Note: The tools definitions must come before bsd.prefs.mk is included.
+
+# tools used by this Makefile
+USE_TOOLS+= [ awk cat cmp echo env expr false fgrep grep mv rm sed \
+ sort wc
+
+# additional tools used by bsd.pkg.subdir.mk
+USE_TOOLS+= basename touch
+
+# additional tools used by bsd.bulk-pkg.mk
+USE_TOOLS+= egrep find ls sh tee true tsort
+
+PKGSRCTOP= yes
+
.include "mk/bsd.prefs.mk"
.if defined(SPECIFIC_PKGS)
diff --git a/mk/misc/toplevel.mk b/mk/misc/toplevel.mk
index 827118c263e..489f9083e23 100644
--- a/mk/misc/toplevel.mk
+++ b/mk/misc/toplevel.mk
@@ -1,4 +1,4 @@
-# $NetBSD: toplevel.mk,v 1.1 2007/01/06 17:10:42 rillig Exp $
+# $NetBSD: toplevel.mk,v 1.2 2007/01/07 00:57:36 rillig Exp $
#
# This file contains the make targets that can be used from the
# top-level Makefile. They are in this separate file to keep the
@@ -6,19 +6,6 @@
#
#
-# tools used by this Makefile
-USE_TOOLS+= [ awk cat cmp echo env expr false fgrep grep mv rm sed \
- sort wc
-
-# additional tools used by bsd.pkg.subdir.mk
-USE_TOOLS+= basename touch
-
-# additional tools used by bsd.bulk-pkg.mk
-USE_TOOLS+= egrep find ls sh tee true tsort
-
-PKGSRCTOP= yes
-
-
# If PACKAGES is set to the default (${PKGSRCDIR}/packages), the current
# ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
# structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
@@ -88,7 +75,7 @@ ${.CURDIR}/PKGDB:
.PHONY: index
index:
- @${RM} ${.CURDIR}/INDEX
+ @${RM} -f ${.CURDIR}/INDEX
@${MAKE} ${.CURDIR}/INDEX
${.CURDIR}/INDEX: