svn commit: r255859 - head

[John Baldwin]

Author: jhb
Date: Tue Sep 24 19:09:21 2013
New Revision: 255859
URL: http://svnweb.freebsd.org/changeset/base/255859

Log:
  Don't parse NO_ROOT metadata for extra kernels if NO_ROOT isn't defined.
  
  Approved by:	re (gjb)
  MFC after:	1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Sep 24 18:46:18 2013	(r255858)
+++ head/Makefile.inc1	Tue Sep 24 19:09:21 2013	(r255859)
@@ -1089,9 +1089,11 @@ distributekernel distributekernel.debug:
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
+.if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+.endif
 .endfor
 
 packagekernel: