diff options
| author | rillig <rillig@pkgsrc.org> | 2007-08-13 06:03:46 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-08-13 06:03:46 +0000 |
| commit | 7d184f93ff74a2409b12ee91c28677507dca4543 (patch) | |
| tree | 740b06121e4bd164ce7cbf5c20c1cc77ddb76596 /mk/bsd.pkg.mk | |
| parent | 6fc362c5587b608441abc54c9c129ae0a68f1b32 (diff) | |
| download | pkgsrc-7d184f93ff74a2409b12ee91c28677507dca4543.tar.gz | |
Moved the stuff that is common to all directories of pkgsrc into its own
file. Now "make help" can be called from the top-level directory,
avoiding to parse lots of buildlink3.mk files just to get some help.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 551bcc03931..50a535226c6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1920 2007/08/13 05:24:26 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1921 2007/08/13 06:03:46 rillig Exp $ # # This file is in the public domain. # @@ -19,15 +19,7 @@ # build # -.MAIN: all - -.if defined(.MAKEFLAGS) && !empty(.MAKEFLAGS:M-j*) -PKG_FAIL_REASON+= "[bsd.pkg.mk] pkgsrc does not support parallel make for the infrastructure." -PKG_FAIL_REASON+= "[bsd.pkg.mk] Run \"${MAKE} help topic=make_jobs\" to get some parallelism." -.endif - -# Include any preferences, if not already included, and common definitions -.include "${.PARSEDIR}/bsd.prefs.mk" +.include "${.PARSEDIR}/misc/common.mk" .if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS) . include "${.PARSEDIR}/emulator/emulator.mk" @@ -264,31 +256,6 @@ LIBABISUFFIX?= TOUCH_FLAGS?= -f -# Debugging levels for this file, dependent on PKG_DEBUG_LEVEL definition -# 0 == normal, default, quiet operation -# 1 == all shell commands echoed before invocation -# 2 == shell "set -x" operation -PKG_DEBUG_LEVEL?= 0 -_PKG_SILENT= @ -_PKG_DEBUG= # empty -_PKG_DEBUG_SCRIPT= ${SH} - -.if ${PKG_DEBUG_LEVEL} > 0 -_PKG_SILENT= # empty -.endif - -.if ${PKG_DEBUG_LEVEL} > 1 -_PKG_DEBUG= set -x; -_PKG_DEBUG_SCRIPT= ${SH} -x -.endif - -# This variable can be prepended to all shell commands that should not -# be printed by default, but when PKGSRC_DEBUG_LEVEL is non-zero. -# It also re-adds the error checking that has been removed in 2004 to -# make bmake conform to POSIX. -# -RUN= ${_PKG_SILENT}${_PKG_DEBUG} set -e; - # A few aliases for *-install targets INSTALL= ${TOOLS_INSTALL} # XXX override sys.mk INSTALL_PROGRAM?= \ @@ -839,8 +806,5 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR} .if make(debug) . include "${.PARSEDIR}/bsd.pkg.debug.mk" .endif -.if make(help) -. include "${.PARSEDIR}/help/help.mk" -.endif .include "${.PARSEDIR}/misc/warnings.mk" .include "${.PARSEDIR}/misc/can-be-built-here.mk" |