diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-03-06 15:03:21 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-03-06 15:03:21 +0000 |
commit | 3a6849a6e8ea2477244b4c92ab25c1dda52f4cf0 (patch) | |
tree | 99b30a7d5bb37c393b93b8a3fb8d56500fc5e737 /usr.sbin/mergemaster | |
parent | 64f37911f8e5a367c616a2c670859d7593d6f24b (diff) | |
download | src-3a6849a6e8ea2477244b4c92ab25c1dda52f4cf0.tar.gz src-3a6849a6e8ea2477244b4c92ab25c1dda52f4cf0.zip |
Set MAKEOBJDIRPREFIX in the environment, like God intended. This
only worked because src/Makefile.inc1 is wrapped by src/Makefile.
Silence from: dougb
Notes
Notes:
svn path=/head/; revision=126694
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index a4ffa3cf0fa6..b980266a941b 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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"; |