diff options
| author | ru <ru@FreeBSD.org> | 2004-03-06 15:03:21 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-03-06 15:03:21 +0000 |
| commit | d763a3ee32bbf9afe40744bff2abaf67a75150f3 (patch) | |
| tree | 99b30a7d5bb37c393b93b8a3fb8d56500fc5e737 /usr.sbin/mergemaster | |
| parent | 5993cc3bceb56b1f60b38f440b7389ac6643ab32 (diff) | |
| download | FreeBSD-src-d763a3ee32bbf9afe40744bff2abaf67a75150f3.zip FreeBSD-src-d763a3ee32bbf9afe40744bff2abaf67a75150f3.tar.gz | |
Set MAKEOBJDIRPREFIX in the environment, like God intended. This
only worked because src/Makefile.inc1 is wrapped by src/Makefile.
Silence from: dougb
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 a4ffa3c..b980266 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"; |
