d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set MAKEOBJDIRPREFIX in the environment, like God intended. This

Browse Source 
only worked because src/Makefile.inc1 is wrapped by src/Makefile.

Silence from:	dougb
This commit is contained in:
Ruslan Ermilov 2004-03-06 15:03:21 +00:00
parent 64f37911f8
commit 3a6849a6e8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126694
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/mergemaster/mergemaster.sh
View File

@ -507,9 +507,9 @@ case "${RERUN}" in
;;
esac
make DESTDIR=${TEMPROOT} distrib-dirs &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj all &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make obj &&
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make all &&
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make DESTDIR=${TEMPROOT} \
distribution;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";