summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-10-13 19:44:36 +0000
committerbapt <bapt@FreeBSD.org>2015-10-13 19:44:36 +0000
commitc8d6d4a78596005d50c30c7ab4f623a601ef0b39 (patch)
treee5218cae2f48913719be46210d8d92085cb2511f /include
parent2a77c3b71d27973d4ffac086902715be69266202 (diff)
parent384c892651c52e57063356328dfcd28914bc4b15 (diff)
downloadFreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.zip
FreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.tar.gz
Merge from head
Diffstat (limited to 'include')
-rw-r--r--include/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/Makefile b/include/Makefile
index ccdc8aa..1cecff7 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -166,18 +166,18 @@ compat:
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
-p ${DESTDIR}${INCLUDEDIR} > /dev/null
.if ${MK_META_MODE} == "yes"
- touch ${.TARGET}
+ @touch ${.TARGET}
.endif
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; \
@@ -255,7 +255,7 @@ copies:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${DESTDIR}${INCLUDEDIR}/teken
.if ${MK_META_MODE} == "yes"
- touch ${.TARGET}
+ @touch ${.OBJDIR}/${.TARGET}
.endif
symlinks:
@@ -372,7 +372,7 @@ symlinks:
${DESTDIR}${INCLUDEDIR}/rpc; \
done
.if ${MK_META_MODE} == "yes"
- touch ${.TARGET}
+ @touch ${.OBJDIR}/${.TARGET}
.endif
.if ${MACHINE} == "host"
OpenPOWER on IntegriCloud