diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-13 19:44:36 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-10-13 19:44:36 +0000 |
| commit | becbad1f6e18fec7c3bf286778a766ffca4457be (patch) | |
| tree | e5218cae2f48913719be46210d8d92085cb2511f /include | |
| parent | 23a32822d2a98273412f5b7d5e4b0ea925d637a0 (diff) | |
| parent | b0c041f88747fad7ef1680da932748352efbf77e (diff) | |
| download | src-becbad1f6e18fec7c3bf286778a766ffca4457be.tar.gz src-becbad1f6e18fec7c3bf286778a766ffca4457be.zip | |
Merge from head
Notes
Notes:
svn path=/projects/collation/; revision=289256
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/Makefile b/include/Makefile index ccdc8aafca0a..1cecff751b00 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" |