diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-08-25 22:06:29 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-08-25 22:06:29 +0000 |
| commit | e5d264a34bd78e42bde7a52d610ce18cc12a8071 (patch) | |
| tree | b4a5821ae6e9dd964858100a32ae6bce717f7f5a /Makefile.inc1 | |
| parent | 161a0c7cff3b3c52f98c46200e915f97d56c45d8 (diff) | |
| download | src-test2-e5d264a34bd78e42bde7a52d610ce18cc12a8071.tar.gz src-test2-e5d264a34bd78e42bde7a52d610ce18cc12a8071.zip | |
Fix "make world DESTDIR=/mnt" to work again. A recent change
to make(1) that causes command-line variables to be passed as
command-line variables to sub-processes that make(1) executes
broke it. By changing the type of all DESTDIR variables used
internally in Makefile.inc1, from environment to command-line
variables of the highest priority, I was able to "make world"
with success, with the command-line variable DESTDIR set.
Notes
Notes:
svn path=/head/; revision=134311
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 70a6517d83eb..7b564b2fc413 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -177,13 +177,13 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac # bootstrap-tools stage -BMAKEENV= DESTDIR= \ - INSTALL="sh ${.CURDIR}/tools/install.sh" \ +BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS @@ -191,6 +191,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage @@ -198,11 +199,10 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB # world stage WMAKEENV= ${CROSSENV} \ - DESTDIR=${WORLDTMP} \ _SHLIBDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 +WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} # install stage .if empty(.MAKEFLAGS:M-n) |