diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/apachever.mk | 4 | ||||
-rw-r--r-- | mk/bsd.options.mk | 6 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 102 | ||||
-rw-r--r-- | mk/bsd.pkg.subdir.mk | 4 | ||||
-rw-r--r-- | mk/check/bsd.check.mk | 18 | ||||
-rw-r--r-- | mk/emulator/darwin.mk | 4 | ||||
-rw-r--r-- | mk/emulator/emulator.mk | 6 | ||||
-rw-r--r-- | mk/emulator/freebsd.mk | 4 | ||||
-rw-r--r-- | mk/emulator/irix.mk | 4 | ||||
-rw-r--r-- | mk/emulator/linux.mk | 4 | ||||
-rw-r--r-- | mk/emulator/netbsd.mk | 4 | ||||
-rw-r--r-- | mk/emulator/osf1.mk | 4 | ||||
-rw-r--r-- | mk/emulator/solaris.mk | 4 | ||||
-rw-r--r-- | mk/emulator/sunos.mk | 4 | ||||
-rw-r--r-- | mk/misc/category.mk | 6 | ||||
-rw-r--r-- | mk/misc/common.mk | 6 | ||||
-rw-r--r-- | mk/misc/toplevel.mk | 6 | ||||
-rw-r--r-- | mk/pam.buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/pkg-build-options.mk | 4 |
19 files changed, 99 insertions, 99 deletions
diff --git a/mk/apachever.mk b/mk/apachever.mk index c9ac4a668dd..0d8e959cada 100644 --- a/mk/apachever.mk +++ b/mk/apachever.mk @@ -1,5 +1,5 @@ -# $NetBSD: apachever.mk,v 1.3 2007/09/29 15:58:16 rillig Exp $ +# $NetBSD: apachever.mk,v 1.4 2007/10/13 11:04:15 dsl Exp $ # # This file is obsolete. It will be removed after branching 2007Q4. # -.include "${.PARSEDIR}/apache.mk" +.include "apache.mk" diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 463b0a06626..1f8b88656b4 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.63 2007/10/07 21:48:30 rillig Exp $ +# $NetBSD: bsd.options.mk,v 1.64 2007/10/13 11:04:16 dsl Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -157,7 +157,7 @@ _PKG_VARS.options= PKG_SUPPORTED_OPTIONS PKG_OPTIONS_VAR \ PKG_LEGACY_OPTIONS PKG_OPTIONS_DEPRECATED_WARNINGS _SYS_VARS.options= PKG_OPTIONS -.include "../../mk/bsd.prefs.mk" +.include "bsd.prefs.mk" # Define PKG_OPTIONS, no matter if we have an error or not, to suppress # further make(1) warnings. @@ -206,7 +206,7 @@ _PKG_OPTIONS_ALL_SETS+= ${_opt_} # # include deprecated variable to options mapping # -.include "${.PARSEDIR}/defaults/obsolete.mk" +.include "defaults/obsolete.mk" # # place options implied by legacy variables in PKG_LEGACY_OPTIONS diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e8531490bd6..9884570265b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1927 2007/10/09 19:19:11 martti Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1928 2007/10/13 11:04:16 dsl Exp $ # # This file is in the public domain. # @@ -19,28 +19,28 @@ # build # -.include "${.PARSEDIR}/misc/common.mk" +.include "misc/common.mk" .if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS) -. include "${.PARSEDIR}/emulator/emulator.mk" +. include "emulator/emulator.mk" .endif -.include "${.PARSEDIR}/features/features.mk" +.include "features/features.mk" -.include "${.PARSEDIR}/flavor/bsd.flavor-vars.mk" -.include "${.PARSEDIR}/check/bsd.check-vars.mk" -.include "${.PARSEDIR}/depends/bsd.depends-vars.mk" -.include "${.PARSEDIR}/fetch/bsd.fetch-vars.mk" -.include "${.PARSEDIR}/checksum/bsd.checksum-vars.mk" -.include "${.PARSEDIR}/extract/bsd.extract-vars.mk" -.include "${.PARSEDIR}/patch/bsd.patch-vars.mk" -.include "${.PARSEDIR}/configure/bsd.configure-vars.mk" -.include "${.PARSEDIR}/build/bsd.build-vars.mk" -.include "${.PARSEDIR}/install/bsd.install-vars.mk" +.include "flavor/bsd.flavor-vars.mk" +.include "check/bsd.check-vars.mk" +.include "depends/bsd.depends-vars.mk" +.include "fetch/bsd.fetch-vars.mk" +.include "checksum/bsd.checksum-vars.mk" +.include "extract/bsd.extract-vars.mk" +.include "patch/bsd.patch-vars.mk" +.include "configure/bsd.configure-vars.mk" +.include "build/bsd.build-vars.mk" +.include "install/bsd.install-vars.mk" -.include "${.PARSEDIR}/bsd.pkg.error.mk" +.include "bsd.pkg.error.mk" -.include "${.PARSEDIR}/bsd.hacks.mk" +.include "bsd.hacks.mk" ############################################################################ # Transform package Makefile variables and set defaults @@ -106,7 +106,7 @@ PKGTOOLS_REQD= 20070802 ##### Transform USE_* into dependencies -.include "${.PARSEDIR}/bsd.pkg.use.mk" +.include "bsd.pkg.use.mk" ############################################################################ # Sanity checks @@ -329,7 +329,7 @@ OVERRIDE_DIRDEPTH?= 2 # Handle alternatives # -.include "${.PARSEDIR}/alternatives.mk" +.include "alternatives.mk" # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree # of dependencies for building, and the current target. @@ -410,19 +410,19 @@ USE_TOOLS+= tee tsort .endif # INSTALL/DEINSTALL script framework -.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk" +.include "pkginstall/bsd.pkginstall.mk" # Locking -.include "${.PARSEDIR}/internal/locking.mk" +.include "internal/locking.mk" # Tools -.include "${.PARSEDIR}/tools/bsd.tools.mk" +.include "tools/bsd.tools.mk" # Barrier -.include "${.PARSEDIR}/bsd.pkg.barrier.mk" +.include "bsd.pkg.barrier.mk" # Unprivileged builds -.include "${.PARSEDIR}/unprivileged.mk" +.include "unprivileged.mk" # If NO_BUILD is defined, default to not needing a compiler. .if defined(NO_BUILD) @@ -432,9 +432,9 @@ USE_LANGUAGES?= # empty # Get the proper dependencies and set the PATH to use the compiler # named in PKGSRC_COMPILER. # -.include "${.PARSEDIR}/compiler.mk" +.include "compiler.mk" -.include "${.PARSEDIR}/wrapper/bsd.wrapper.mk" +.include "wrapper/bsd.wrapper.mk" .if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS) . if !empty(USE_ABI_DEPENDS:M[yY][eE][sS]) @@ -448,7 +448,7 @@ _BUILD_DEFS+= USE_ABI_DEPENDS # Find out the PREFIX of dependencies where the PREFIX is needed at build time. .if defined(EVAL_PREFIX) FIND_PREFIX:= ${EVAL_PREFIX} -. include "${.PARSEDIR}/find-prefix.mk" +. include "find-prefix.mk" .endif .if !defined(_PATH_ORIG) @@ -600,21 +600,21 @@ ${.CURDIR}/${WRKDIR_BASENAME}: fi .endif -.include "${.PARSEDIR}/flavor/bsd.flavor.mk" +.include "flavor/bsd.flavor.mk" -.include "${.PARSEDIR}/depends/bsd.depends.mk" -.include "${.PARSEDIR}/check/bsd.check.mk" -.include "${.PARSEDIR}/fetch/bsd.fetch.mk" -.include "${.PARSEDIR}/checksum/bsd.checksum.mk" -.include "${.PARSEDIR}/extract/bsd.extract.mk" -.include "${.PARSEDIR}/patch/bsd.patch.mk" -.include "${.PARSEDIR}/configure/bsd.configure.mk" -.include "${.PARSEDIR}/build/bsd.build.mk" -.include "${.PARSEDIR}/install/bsd.install.mk" -.include "${.PARSEDIR}/package/bsd.package.mk" +.include "depends/bsd.depends.mk" +.include "check/bsd.check.mk" +.include "fetch/bsd.fetch.mk" +.include "checksum/bsd.checksum.mk" +.include "extract/bsd.extract.mk" +.include "patch/bsd.patch.mk" +.include "configure/bsd.configure.mk" +.include "build/bsd.build.mk" +.include "install/bsd.install.mk" +.include "package/bsd.package.mk" -.include "${.PARSEDIR}/bsd.pkg.clean.mk" -.include "${.PARSEDIR}/bsd.pkg.update.mk" +.include "bsd.pkg.clean.mk" +.include "bsd.pkg.update.mk" # su-target is a macro target that does just-in-time su-to-root before # reinvoking the make process as root. It acquires root privileges and @@ -676,7 +676,7 @@ _BIN_INSTALL_FLAGS+= ${PKG_ARGS_ADD} _SHORT_UNAME_R= ${:!${UNAME} -r!:C@\.([0-9]*)[_.].*@.\1@} # n.n[_.]anything => n.n -.include "${.PARSEDIR}/install/bin-install.mk" +.include "install/bin-install.mk" .PHONY: show-pkgtools-version .if !target(show-pkgtools-version) @@ -745,22 +745,22 @@ depend: tags: .endif -.include "${.PARSEDIR}/plist/bsd.plist.mk" +.include "plist/bsd.plist.mk" -.include "${.PARSEDIR}/bsd.utils.mk" +.include "bsd.utils.mk" -.include "${.PARSEDIR}/subst.mk" +.include "subst.mk" # # For bulk build targets (bulk-install, bulk-package), the # BATCH variable must be set in /etc/mk.conf: # .if defined(BATCH) -. include "${.PARSEDIR}/bulk/bsd.bulk-pkg.mk" +. include "bulk/bsd.bulk-pkg.mk" .endif # README generation code. -.include "${.PARSEDIR}/bsd.pkg.readme.mk" +.include "bsd.pkg.readme.mk" # Create a PKG_ERROR_HANDLER shell command for each class listed in # PKG_ERROR_CLASSES. The error handler is meant to be invoked within @@ -804,15 +804,15 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR} .endfor .if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir) -.include "${.PARSEDIR}/pbulk/pbulk-index.mk" +.include "pbulk/pbulk-index.mk" .endif .if defined(PKG_DEVELOPER) -. include "${.PARSEDIR}/misc/developer.mk" +. include "misc/developer.mk" .endif -.include "${.PARSEDIR}/misc/show.mk" +.include "misc/show.mk" .if make(debug) -. include "${.PARSEDIR}/bsd.pkg.debug.mk" +. include "bsd.pkg.debug.mk" .endif -.include "${.PARSEDIR}/misc/warnings.mk" -.include "${.PARSEDIR}/misc/can-be-built-here.mk" +.include "misc/warnings.mk" +.include "misc/can-be-built-here.mk" diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk index 99ef3b30a48..9c0f0e4f135 100644 --- a/mk/bsd.pkg.subdir.mk +++ b/mk/bsd.pkg.subdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.subdir.mk,v 1.68 2007/08/13 08:12:51 rillig Exp $ +# $NetBSD: bsd.pkg.subdir.mk,v 1.69 2007/10/13 11:04:16 dsl Exp $ # Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # @@ -26,7 +26,7 @@ # mirror-distfiles, bulk-install, bulk-package, ${PKG_MISC_TARGETS} # -.include "${.PARSEDIR}/misc/common.mk" +.include "misc/common.mk" AWK?= /usr/bin/awk CAT?= /bin/cat diff --git a/mk/check/bsd.check.mk b/mk/check/bsd.check.mk index 9e48a5e6bbd..2bfbf9e5d0a 100644 --- a/mk/check/bsd.check.mk +++ b/mk/check/bsd.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.check.mk,v 1.5 2006/12/12 21:37:20 rillig Exp $ +# $NetBSD: bsd.check.mk,v 1.6 2007/10/13 11:04:17 dsl Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to build and install checks. @@ -25,14 +25,14 @@ # check-interpreter, check-shlibs, check-vulnerable, check-wrkref # -.include "${.PARSEDIR}/check-files.mk" -.include "${.PARSEDIR}/check-headers.mk" -.include "${.PARSEDIR}/check-interpreter.mk" -.include "${.PARSEDIR}/check-perms.mk" -.include "${.PARSEDIR}/check-portability.mk" -.include "${.PARSEDIR}/check-shlibs.mk" -.include "${.PARSEDIR}/check-vulnerable.mk" -.include "${.PARSEDIR}/check-wrkref.mk" +.include "check-files.mk" +.include "check-headers.mk" +.include "check-interpreter.mk" +.include "check-perms.mk" +.include "check-portability.mk" +.include "check-shlibs.mk" +.include "check-vulnerable.mk" +.include "check-wrkref.mk" pre-configure-checks-hook \ pre-build-checks-hook: .PHONY diff --git a/mk/emulator/darwin.mk b/mk/emulator/darwin.mk index 53f39caf9ca..630a7d2b218 100644 --- a/mk/emulator/darwin.mk +++ b/mk/emulator/darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: darwin.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: darwin.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $ # # Darwin (Mac OS X) binary emulation framework # @@ -34,7 +34,7 @@ EMUL_DISTRO= native-darwin # native OSF/1 (Tru64) EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/darwin-${_EMUL_TYPE}.mk" +. include "darwin-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk index e1d13359697..da430fff731 100644 --- a/mk/emulator/emulator.mk +++ b/mk/emulator/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.9 2007/10/09 19:19:13 martti Exp $ +# $NetBSD: emulator.mk,v 1.10 2007/10/13 11:04:17 dsl Exp $ # # This file is included by bsd.pkg.mk. # @@ -72,7 +72,7 @@ OPSYS_EMULDIR?= # empty # # EMUL_DISTRO, EMULSUBDIR, EMULDIR, OPSYS_EMULDIR # -. include "${.PARSEDIR}/${EMUL_OPSYS}.mk" +. include "${EMUL_OPSYS}.mk" .endif # If we're doing true binary emulation, then file paths found in the @@ -140,7 +140,7 @@ _EMUL_PKG_FMTS+= rpm EMUL_PKG_FMT?= plain -.include "${.PARSEDIR}/pkg-${EMUL_PKG_FMT}.mk" +.include "pkg-${EMUL_PKG_FMT}.mk" .PHONY: emul-fetch emul-fetch: diff --git a/mk/emulator/freebsd.mk b/mk/emulator/freebsd.mk index 85f90a56b59..dbafb20d61e 100644 --- a/mk/emulator/freebsd.mk +++ b/mk/emulator/freebsd.mk @@ -1,4 +1,4 @@ -# $NetBSD: freebsd.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: freebsd.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $ # # FreeBSD binary emulation framework # @@ -33,7 +33,7 @@ EMUL_DISTRO= native-freebsd # native FreeBSD installation EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/freebsd-${_EMUL_TYPE}.mk" +. include "freebsd-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/irix.mk b/mk/emulator/irix.mk index 03aa200e603..d6c95bf8d5b 100644 --- a/mk/emulator/irix.mk +++ b/mk/emulator/irix.mk @@ -1,4 +1,4 @@ -# $NetBSD: irix.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: irix.mk,v 1.3 2007/10/13 11:04:17 dsl Exp $ # # IRIX binary emulation framework # @@ -33,7 +33,7 @@ EMUL_DISTRO= native-irix # native IRIX installation EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/irix-${_EMUL_TYPE}.mk" +. include "irix-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index b7f44e714d3..0f07c7bcf1c 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux.mk,v 1.3 2007/09/07 23:04:55 wiz Exp $ +# $NetBSD: linux.mk,v 1.4 2007/10/13 11:04:18 dsl Exp $ # # Linux binary emulation framework # @@ -69,7 +69,7 @@ EMUL_DISTRO= native-linux # native Linux installation EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/linux-${_EMUL_TYPE}.mk" +. include "linux-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/netbsd.mk b/mk/emulator/netbsd.mk index 3b521712952..b8b8059c9cd 100644 --- a/mk/emulator/netbsd.mk +++ b/mk/emulator/netbsd.mk @@ -1,4 +1,4 @@ -# $NetBSD: netbsd.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: netbsd.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $ # # NetBSD binary emulation framework # @@ -35,7 +35,7 @@ EMUL_DISTRO= native-netbsd # native NetBSD EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/netbsd-${_EMUL_TYPE}.mk" +. include "netbsd-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/osf1.mk b/mk/emulator/osf1.mk index 97e5058c648..45c6c44cf2b 100644 --- a/mk/emulator/osf1.mk +++ b/mk/emulator/osf1.mk @@ -1,4 +1,4 @@ -# $NetBSD: osf1.mk,v 1.3 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: osf1.mk,v 1.4 2007/10/13 11:04:18 dsl Exp $ # # OSF/1 (Tru64) binary emulation framework # @@ -34,7 +34,7 @@ EMUL_DISTRO= native-osf1 # native OSF/1 (Tru64) EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/osf1-${_EMUL_TYPE}.mk" +. include "osf1-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/solaris.mk b/mk/emulator/solaris.mk index db796663efb..e694d362390 100644 --- a/mk/emulator/solaris.mk +++ b/mk/emulator/solaris.mk @@ -1,4 +1,4 @@ -# $NetBSD: solaris.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: solaris.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $ # # Solaris (SVR4) binary emulation framework # @@ -42,7 +42,7 @@ EMUL_DISTRO= native-solaris # native SunOS 5.x EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/solaris-${_EMUL_TYPE}.mk" +. include "solaris-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/emulator/sunos.mk b/mk/emulator/sunos.mk index bdd8ae79cb7..8b92271448e 100644 --- a/mk/emulator/sunos.mk +++ b/mk/emulator/sunos.mk @@ -1,4 +1,4 @@ -# $NetBSD: sunos.mk,v 1.2 2007/08/23 17:39:47 jlam Exp $ +# $NetBSD: sunos.mk,v 1.3 2007/10/13 11:04:18 dsl Exp $ # # SunOS 4.x binary emulation framework # @@ -33,7 +33,7 @@ EMUL_DISTRO= native-sunos # native SunOS 4.x EMULDIR= ${PREFIX} EMULSUBDIR= # empty .else -. include "${.PARSEDIR}/sunos-${_EMUL_TYPE}.mk" +. include "sunos-${_EMUL_TYPE}.mk" .endif .if (${_EMUL_TYPE} == "builtin") || (${_EMUL_TYPE} == "native") diff --git a/mk/misc/category.mk b/mk/misc/category.mk index b0e3239b448..1a16a11083a 100644 --- a/mk/misc/category.mk +++ b/mk/misc/category.mk @@ -1,9 +1,9 @@ -# $NetBSD: category.mk,v 1.1 2007/08/13 08:12:51 rillig Exp $ +# $NetBSD: category.mk,v 1.2 2007/10/13 11:04:18 dsl Exp $ # # This file contains the variables and targets for category Makefiles. # -.include "${.PARSEDIR}/common.mk" +.include "common.mk" README.html: .PRECIOUS .PHONY @> $@.tmp @@ -42,4 +42,4 @@ README.html: .PRECIOUS .PHONY @cd ${subdir} && ${RECURSIVE_MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}${.CURDIR:T}/" ${_README_TYPE} .endfor -.include "${.PARSEDIR}/../bsd.pkg.subdir.mk" +.include "../bsd.pkg.subdir.mk" diff --git a/mk/misc/common.mk b/mk/misc/common.mk index 5fbe60de22c..10f1321ca86 100644 --- a/mk/misc/common.mk +++ b/mk/misc/common.mk @@ -1,4 +1,4 @@ -# $NetBSD: common.mk,v 1.2 2007/08/13 08:45:17 rillig Exp $ +# $NetBSD: common.mk,v 1.3 2007/10/13 11:04:19 dsl Exp $ # # This file contains the definitions that are used in all directories of # pkgsrc -- the top-level, the categories and the packages themselves. @@ -25,7 +25,7 @@ PKG_FAIL_REASON+= "[bsd.pkg.mk] Run \"${MAKE} help topic=make_jobs\" to get some .endif # Include any preferences, if not already included, and common definitions -.include "${.PARSEDIR}/../bsd.prefs.mk" +.include "../bsd.prefs.mk" PKG_DEBUG_LEVEL?= 0 _PKG_SILENT= @ @@ -44,5 +44,5 @@ _PKG_DEBUG_SCRIPT= ${SH} -x RUN= ${_PKG_SILENT}${_PKG_DEBUG} set -e; .if make(help) -.include "${.PARSEDIR}/../help/help.mk" +.include "../help/help.mk" .endif diff --git a/mk/misc/toplevel.mk b/mk/misc/toplevel.mk index bfddf5968a3..ddb271b43f5 100644 --- a/mk/misc/toplevel.mk +++ b/mk/misc/toplevel.mk @@ -1,4 +1,4 @@ -# $NetBSD: toplevel.mk,v 1.3 2007/09/07 22:12:15 jlam Exp $ +# $NetBSD: toplevel.mk,v 1.4 2007/10/13 11:04:19 dsl 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 @@ -27,13 +27,13 @@ README.html: .PRECIOUS @${FALSE} .endif -.include "${.PARSEDIR}/../bsd.pkg.subdir.mk" +.include "../bsd.pkg.subdir.mk" # the bulk-cache and clean-bulk-cache targets are a global-pkgsrc # thing and thus it makes sense to run it from the top level pkgsrc # directory. .if make(bulk-cache) || make(clean-bulk-cache) -.include "${.PARSEDIR}/../bulk/bsd.bulk-pkg.mk" +.include "../bulk/bsd.bulk-pkg.mk" .endif .PHONY: ${.CURDIR}/PKGDB diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk index 35d85a6d1fc..9441b303eb9 100644 --- a/mk/pam.buildlink3.mk +++ b/mk/pam.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pam.buildlink3.mk,v 1.9 2007/08/14 17:48:53 rillig Exp $ +# $NetBSD: pam.buildlink3.mk,v 1.10 2007/10/13 11:04:16 dsl Exp $ # # This Makefile fragment is meant to be included by packages that # require a PAM implementation. @@ -30,7 +30,7 @@ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ -.include "${.PARSEDIR}/bsd.fast.prefs.mk" +.include "bsd.fast.prefs.mk" .if !empty(PAM_BUILDLINK3_MK:M+) # diff --git a/mk/pkg-build-options.mk b/mk/pkg-build-options.mk index 94b26d55f91..f4ebf9cefd6 100644 --- a/mk/pkg-build-options.mk +++ b/mk/pkg-build-options.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-build-options.mk,v 1.6 2007/10/01 22:32:45 rillig Exp $ +# $NetBSD: pkg-build-options.mk,v 1.7 2007/10/13 11:04:17 dsl Exp $ # # This procedure determines the PKG_OPTIONS that have been in effect # when the package ${pkgbase} has been built. When the package is not @@ -19,7 +19,7 @@ # Keywords: options pkg-build-options PKG_BUILD_OPTIONS # -.include "${.PARSEDIR}/bsd.fast.prefs.mk" +.include "bsd.fast.prefs.mk" .if defined(BUILDLINK_DEPTH) && !empty(BUILDLINK_DEPTH) . for b in ${pkgbase} |