[Midnightbsd-cvs] src [9315] trunk/usr.sbin/mergemaster/mergemaster.sh: Use the system MAKEOBJDIRPREFIX when running make targets in

[laffer1 at midnightbsd.org]

Revision: 9315
          http://svnweb.midnightbsd.org/src/?rev=9315
Author:   laffer1
Date:     2017-03-02 19:13:29 -0500 (Thu, 02 Mar 2017)
Log Message:
-----------
Use the system MAKEOBJDIRPREFIX when running make targets in
mergemaster.  This allows bootstrap verions of tools to be used.

Modified Paths:
--------------
    trunk/usr.sbin/mergemaster/mergemaster.sh

Modified: trunk/usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- trunk/usr.sbin/mergemaster/mergemaster.sh	2017-03-03 00:12:32 UTC (rev 9314)
+++ trunk/usr.sbin/mergemaster/mergemaster.sh	2017-03-03 00:13:29 UTC (rev 9315)
@@ -633,16 +633,10 @@
         ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs >/dev/null
         ;;
       esac
-      if [ -d `${MM_MAKE} -V .OBJDIR` ]; then
-	od=`${MM_MAKE} -V MAKEOBJDIRPREFIX`
-      else
-        od=${TEMPROOT}/usr/obj
-      fi
-      echo $od 1>&2
       ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
-      MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
+      ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
+      ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
+      ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
     { echo '';
      echo "  *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
       echo "      the temproot environment";