From d763a3ee32bbf9afe40744bff2abaf67a75150f3 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Sat, 6 Mar 2004 15:03:21 +0000
Subject: Set MAKEOBJDIRPREFIX in the environment, like God intended.  This
 only worked because src/Makefile.inc1 is wrapped by src/Makefile.

Silence from:	dougb
---
 usr.sbin/mergemaster/mergemaster.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/mergemaster')

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";
-- 
cgit v1.1