From owner-svn-src-head@freebsd.org  Sun Nov  5 22:29:35 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7755E53BDD;
 Sun,  5 Nov 2017 22:29:35 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 865876F147;
 Sun,  5 Nov 2017 22:29:35 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA5MTY8e007046;
 Sun, 5 Nov 2017 22:29:34 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA5MTY0v007045;
 Sun, 5 Nov 2017 22:29:34 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201711052229.vA5MTY0v007045@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 5 Nov 2017 22:29:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325457 - head/release/scripts
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/release/scripts
X-SVN-Commit-Revision: 325457
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Nov 2017 22:29:35 -0000

Author: bdrewery
Date: Sun Nov  5 22:29:34 2017
New Revision: 325457
URL: https://svnweb.freebsd.org/changeset/base/325457

Log:
  Rework r325076: Just use the pre-existing OBJDIR.
  
  Like was done in usr.sbin/mergemaster in r249906, we can just use
  the already-built OBJDIR for install(1).
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/release/scripts/mm-mtree.sh

Modified: head/release/scripts/mm-mtree.sh
==============================================================================
--- head/release/scripts/mm-mtree.sh	Sun Nov  5 22:28:39 2017	(r325456)
+++ head/release/scripts/mm-mtree.sh	Sun Nov  5 22:29:34 2017	(r325457)
@@ -114,14 +114,10 @@ echo ''
     ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
     ;;
   esac
-  od=${TEMPROOT}/usr/obj
   ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
-  MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \
-      MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \
-      MK_CDDL=no MK_TESTS=no MK_RESCUE=no &&
-  MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
-  MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
-  MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
+  ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
+  ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
+  ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
   { echo '';
     echo "  *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
     echo "      the temproot environment";