diff options
author | jkh <jkh@FreeBSD.org> | 1994-11-04 03:53:46 +0800 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1994-11-04 03:53:46 +0800 |
commit | 11b4a791e639bc15cf26c46b6a5698fe9b1140ed (patch) | |
tree | 2e06c661a3f7a89cdb841755e1bb024c433932e2 /Mk | |
parent | 9e3621d32262bbe9a40e5d38b9ec33dccc1180d2 (diff) | |
download | freebsd-ports-gnome-11b4a791e639bc15cf26c46b6a5698fe9b1140ed.tar.gz freebsd-ports-gnome-11b4a791e639bc15cf26c46b6a5698fe9b1140ed.tar.zst freebsd-ports-gnome-11b4a791e639bc15cf26c46b6a5698fe9b1140ed.zip |
For submakes, don't do a `${MAKE} ${MAKEFILE} all' or
`${MAKE} ${MAKEFILE} install', indirect the target through ALL_TARGET and
INSTALL_TARGET now, so they can be easily overridden.
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.port.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a84d2d5ae9d2..733d5d08118c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3,7 +3,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.62 1994/11/01 21:04:27 jkh Exp $ +# $Id: bsd.port.mk,v 1.63 1994/11/03 19:14:08 jkh Exp $ # # Please view me with 4 column tabs! @@ -142,6 +142,9 @@ PKG_CMD?= pkg_create PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST -p ${PREFIX} PKG_SUFX?= .tgz +ALL_TARGET?= all +INSTALL_TARGET?= install + # I guess we're in the master distribution business! :) As we gain mirror # sites for distfiles, add them to this list. MASTER_SITES+= ftp://freebsd.cdrom.com/pub/FreeBSD/FreeBSD-current/ports/distfiles/ @@ -246,9 +249,9 @@ ${INSTALL_COOKIE}: @echo "===> Installing for ${DISTNAME}" @${MAKE} ${.MAKEFLAGS} pre-install .if defined(USE_GMAKE) - @(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} install) + @(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .else defined(USE_GMAKE) - @(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} install) + @(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .if defined(USE_IMAKE) @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man) .endif @@ -297,9 +300,9 @@ ${BUILD_COOKIE}: .endif .endif .if defined(USE_GMAKE) - @(cd ${WRKSRC}; ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} all) + @(cd ${WRKSRC}; ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) .else defined(USE_GMAKE) - @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} all) + @(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) .endif @if [ -f ${SCRIPTDIR}/post-build ]; then \ env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \ |