diff options
| author | hubertf <hubertf> | 1997-09-28 11:22:40 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1997-09-28 11:22:40 +0000 |
| commit | 42ecc48a463c9c34eb417644ddcb82a2509b408e (patch) | |
| tree | c8924671df990aed15b16648a8ea40eb4929a6e7 /mk | |
| parent | aee1acd13631911d0db3618474d1de5c18123725 (diff) | |
| download | pkgsrc-42ecc48a463c9c34eb417644ddcb82a2509b408e.tar.gz | |
- Move around .include <bsd.own.mk> so PORTSDIR gets set propperly
- make 'make clean' DTRT when WRKOBJDIR is set
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e6cf65ba0e7..34ea9e7fd7a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.pkg.mk,v 1.6 1997/09/28 00:56:00 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.7 1997/09/28 11:22:40 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -350,6 +350,10 @@ WRKSRC?= ${WRKDIR} WRKSRC?= ${WRKDIR}/${DISTNAME} .endif +.if (${OPSYS} == "NetBSD") +.include <bsd.own.mk> +.endif + .if defined(WRKOBJDIR) # XXX Is pwd -P available in FreeBSD's /bin/sh? __canonical_PORTSDIR!= cd ${PORTSDIR}; pwd -P @@ -509,9 +513,6 @@ MTREE_FILE= /etc/mtree/BSD.local.dist MTREE_CMD?= /usr/sbin/mtree MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> -.endif .if (${OPSYS} == "OpenBSD") .include <bsd.own.mk> MAKE_ENV+= EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>" @@ -1360,6 +1361,10 @@ clean: pre-clean .endif @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" .if !defined(NO_WRKDIR) +.if defined(WRKOBJDIR) + @${RM} -rf ${WRKOBJDIR}/${PORTSUBDIR} + @${RM} ${WRKDIR} +.else @if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ ${RM} -rf ${WRKDIR}; \ @@ -1367,6 +1372,7 @@ clean: pre-clean ${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \ fi; \ fi +.endif .else @${RM} -f ${WRKDIR}/.*_done .endif diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index d1b05367bad..0a475893b57 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.port.mk,v 1.6 1997/09/28 00:56:00 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.7 1997/09/28 11:22:40 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -350,6 +350,10 @@ WRKSRC?= ${WRKDIR} WRKSRC?= ${WRKDIR}/${DISTNAME} .endif +.if (${OPSYS} == "NetBSD") +.include <bsd.own.mk> +.endif + .if defined(WRKOBJDIR) # XXX Is pwd -P available in FreeBSD's /bin/sh? __canonical_PORTSDIR!= cd ${PORTSDIR}; pwd -P @@ -509,9 +513,6 @@ MTREE_FILE= /etc/mtree/BSD.local.dist MTREE_CMD?= /usr/sbin/mtree MTREE_ARGS?= -U -f ${MTREE_FILE} -d -e -p -.if (${OPSYS} == "NetBSD") -.include <bsd.own.mk> -.endif .if (${OPSYS} == "OpenBSD") .include <bsd.own.mk> MAKE_ENV+= EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>" @@ -1360,6 +1361,10 @@ clean: pre-clean .endif @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" .if !defined(NO_WRKDIR) +.if defined(WRKOBJDIR) + @${RM} -rf ${WRKOBJDIR}/${PORTSUBDIR} + @${RM} ${WRKDIR} +.else @if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ ${RM} -rf ${WRKDIR}; \ @@ -1367,6 +1372,7 @@ clean: pre-clean ${ECHO_MSG} "===> ${WRKDIR} not writable, skipping"; \ fi; \ fi +.endif .else @${RM} -f ${WRKDIR}/.*_done .endif |