diff options
| author | jlam <jlam@pkgsrc.org> | 2002-10-19 20:33:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-10-19 20:33:59 +0000 |
| commit | 0905c3678b64b7048ea28f495bf00df0139533e5 (patch) | |
| tree | 5f1fc01ded712a7ca80cc9617578b6ca38bb0c92 /mk/bsd.pkg.mk | |
| parent | 0ae42e591978bbe263989d1c7bc83d5b7bc6924b (diff) | |
| download | pkgsrc-0905c3678b64b7048ea28f495bf00df0139533e5.tar.gz | |
Move some variable definitions from bsd.pkg.mk to bsd.prefs.mk so that
they may be used in conditional statements in *.mk files before bsd.pkg.mk
is included.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index aad762753c8..c0437cf5bcc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1067 2002/10/13 09:38:58 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1068 2002/10/19 20:33:59 jlam Exp $ # # This file is in the public domain. # @@ -47,21 +47,11 @@ CHECK_SHLIBS?= YES # run check-shlibs after install SHLIB_HANDLING?= YES # do automatic shared lib handling NOCLEAN?= NO # don't clean up after update -_PKGSRCDIR?= ${.CURDIR:C|/[^/]*/[^/]*$||} -PKGPATH?= ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|} PKGBASE?= ${PKGNAME:C/-[^-]*$//} PKGVERSION?= ${PKGNAME:C/^.*-//} PKGWILDCARD?= ${PKGBASE}-[0-9]* -DISTDIR?= ${_PKGSRCDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} -PACKAGES?= ${_PKGSRCDIR}/packages -TEMPLATES?= ${_PKGSRCDIR}/templates - -PATCHDIR?= ${.CURDIR}/patches -SCRIPTDIR?= ${.CURDIR}/scripts -FILESDIR?= ${.CURDIR}/files -PKGDIR?= ${.CURDIR} INTERACTIVE_STAGE?= none @@ -484,28 +474,6 @@ _PKG_DEBUG= set -x; _PKG_DEBUG_SCRIPT= ${SH} -x .endif -# If WRKOBJDIR is set, use that tree to build -.ifdef WRKOBJDIR -BUILD_DIR?= ${WRKOBJDIR}/${PKGPATH} -.else -BUILD_DIR?= ${.CURDIR} -.endif # WRKOBJDIR - -# If OBJHOSTNAME is set, use first component of hostname in directory name -# If OBJMACHINE is set, use ${MACHINE_ARCH} in the working directory name -.if defined(OBJHOSTNAME) -. if !defined(_HOSTNAME) -_HOSTNAME!= ${UNAME} -n -MAKEFLAGS+= _HOSTNAME=${_HOSTNAME} -. endif -WRKDIR_BASENAME?= work.${_HOSTNAME:C|\..*||} -.elif defined(OBJMACHINE) -WRKDIR_BASENAME?= work.${MACHINE_ARCH} -.else -WRKDIR_BASENAME?= work -.endif - -WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME} WRKSRC?= ${WRKDIR}/${DISTNAME} .if defined(NO_WRKSUBDIR) |