Skip to content

Commit

Permalink
The tool definitions must come before including bsd.prefs.mk. Pointed
Browse files Browse the repository at this point in the history
out by wiz.
  • Loading branch information
rillig committed Jan 7, 2007
1 parent 09fee6a commit 495f85b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
16 changes: 15 additions & 1 deletion 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
Expand All @@ -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)
Expand Down
17 changes: 2 additions & 15 deletions mk/misc/toplevel.mk
@@ -1,24 +1,11 @@
# $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
# top-level file short and clean.
#
#

# 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.
Expand Down Expand Up @@ -88,7 +75,7 @@ ${.CURDIR}/PKGDB:

.PHONY: index
index:
@${RM} ${.CURDIR}/INDEX
@${RM} -f ${.CURDIR}/INDEX
@${MAKE} ${.CURDIR}/INDEX

${.CURDIR}/INDEX:
Expand Down

0 comments on commit 495f85b

Please sign in to comment.