From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 18 Sep 2015 21:36:29 +0000 (+0000)
Subject: META_MODE: Avoid command changing in 2nd build.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=28bd003b308e11eddaf1a4cca35c0a61aa91ed8c;p=people%2Fjulieng%2Ffreebsd.git

META_MODE: Avoid command changing in 2nd build.

If the command to be ran changes then a rebuild is caused. Checking
exists(${DESTDIR}...) from make results in this on the 2nd and
possibly subsequent builds due to staging during build.  Avoid this
by always running the existence check in the make sh command.

Sponsored by:	EMC / Isilon Storage Division
---

diff --git a/include/Makefile b/include/Makefile
index 5d585a14319b..3c3f9937c02e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -172,12 +172,12 @@ compat:
 copies:
 .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \
 	${_MARCHS}
-.if exists(${DESTDIR}${INCLUDEDIR}/$i)
-	cd ${DESTDIR}${INCLUDEDIR}/$i; \
-	for h in *.h; do \
-		if [ -L $$h ]; then rm -f $$h; fi; \
-	done
-.endif
+	if [ -d ${DESTDIR}${INCLUDEDIR}/$i ]; then \
+		cd ${DESTDIR}${INCLUDEDIR}/$i; \
+		for h in *.h; do \
+			if [ -L $$h ]; then rm -f $$h; fi; \
+		done; \
+	fi
 .endfor
 .for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS}
 	cd ${.CURDIR}/../sys; \