From owner-svn-src-projects@FreeBSD.ORG Fri Jan 18 23:59:23 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BEC3AE02; Fri, 18 Jan 2013 23:59:23 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8FAF7EC3; Fri, 18 Jan 2013 23:59:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0INxN22094380; Fri, 18 Jan 2013 23:59:23 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0INxNnB094378; Fri, 18 Jan 2013 23:59:23 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201301182359.r0INxNnB094378@svn.freebsd.org> From: Brooks Davis Date: Fri, 18 Jan 2013 23:59:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245634 - in projects/mtree: . etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 23:59:23 -0000 Author: brooks Date: Fri Jan 18 23:59:22 2013 New Revision: 245634 URL: http://svnweb.freebsd.org/changeset/base/245634 Log: Move a few bits around so NO_ROOT is more concentrated in the makefile. A few minor cleanups. Modified: projects/mtree/Makefile.inc1 projects/mtree/etc/Makefile Modified: projects/mtree/Makefile.inc1 ============================================================================== --- projects/mtree/Makefile.inc1 Fri Jan 18 23:54:27 2013 (r245633) +++ projects/mtree/Makefile.inc1 Fri Jan 18 23:59:22 2013 (r245634) @@ -350,13 +350,6 @@ LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDES ${IMAKE_INSTALL} .endif -.if defined(NO_ROOT) -METALOG?= ${DESTDIR}/${DISTDIR}/METALOG -INSTALL_DDIR= ${DESTDIR}/${DISTDIR} -INSTALLFLAGS= -U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g:S:${DISTBASE}$$::} -MTREEFLAGS= -W -.endif - IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*} IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ ${IMAKE_INSTALL} ${IMAKE_MTREE} @@ -368,12 +361,20 @@ IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif +.if defined(DB_FROM_SRC) +INSTALLFLAGS+= -N ${.CURDIR}/etc +MTREEFLAGS+= -N ${.CURDIR}/etc +.endif .if defined(NO_ROOT) +METALOG?= ${DESTDIR}/${DISTDIR}/METALOG IMAKE+= -DNO_ROOT METALOG=${METALOG} +INSTALL_DDIR= ${DESTDIR}/${DISTDIR} +INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g} +MTREEFLAGS+= -W .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) -IMAKE_INSTALL= INSTALL="install -N ${.CURDIR}/etc ${INSTALLFLAGS}" -IMAKE_MTREE= MTREE_CMD="nmtree -N ${.CURDIR}/etc ${MTREEFLAGS}" +IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" +IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFLAGS}" .endif # kernel stage @@ -741,7 +742,7 @@ distributeworld installworld: installche -mkdir ${DESTDIR}/${DISTDIR}/base cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ - DISTBASE=${DISTBASE} DESTDIR=${DESTDIR}/${DISTDIR}/base \ + DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ Modified: projects/mtree/etc/Makefile ============================================================================== --- projects/mtree/etc/Makefile Fri Jan 18 23:54:27 2013 (r245633) +++ projects/mtree/etc/Makefile Fri Jan 18 23:59:22 2013 (r245634) @@ -328,7 +328,6 @@ distrib-dirs: ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ done; true .if defined(NO_ROOT) - ${ECHO} DISTBASE=${DISTBASE} @set ${MTREES}; \ while test $$# -ge 2; do \ m=${.CURDIR}/$$1; \