restore the find loop to include files generated by configure

This commit is contained in:
christos 2012-12-09 23:18:30 +00:00
parent f69459c655
commit 568b7e7cb5
1 changed files with 7 additions and 14 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.65 2012/12/09 21:48:04 christos Exp $
# $NetBSD: Makefile,v 1.66 2012/12/09 23:18:30 christos Exp $
.include <bsd.own.mk>
@ -76,11 +76,7 @@ defs.mk: config.cache
@touch ${.TARGET}
INCFILES= nbtool_config.h
# Generate the list of include files generated by configure the ./ is so that
# the list is not empty.
_INCCONFFILES!= cd include && find . -name '*.h' && echo ./
INCCONFFILES= ${_INCCONFFILES:S@./@@}
INCSUBDIRS= ${INCCONFFILES:H:O:u:N.}
INCSUBDIRS= sys machine rpc arpa
CLEANDIRFILES+= ${INCFILES}
# CLEANDIRFILES may not contain directory names
@ -96,7 +92,7 @@ include/.stamp:
HOST_LIBDIR= ${TOOLDIR}/lib
HOST_INCSDIR= ${TOOLDIR}/include
HOST_SHAREDIR= ${TOOLDIR}/share
HOST_SHAREDIR= ${TOOLDIR}/share
install: .PHONY install.lib includes install.defs.mk
@ -114,13 +110,6 @@ ${HOST_INCSDIR}/compat/${_f}: ${_f}
${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET}
.endfor
.for _f in ${INCCONFFILES}
HOST_INCINSTFILES+= ${HOST_INCSDIR}/compat/${_f}
${HOST_INCSDIR}/compat/${_f}: include/${_f}
${_MKTARGET_INSTALL}
${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET}
.endfor
.for _d in ${INCSUBDIRS}
HOST_INCINSTDIRS+= ${HOST_INCSDIR}/compat/${_d}
${HOST_INCSDIR}/compat/${_d}:
@ -130,6 +119,10 @@ ${HOST_INCSDIR}/compat/${_d}:
# Install include files in ${TOOLDIR}/include/compat
includes: .PHONY ${HOST_INCINSTDIRS} .WAIT ${HOST_INCINSTFILES}
@(cd include && find . -name '*.h' -print | while read f ; do \
${HOST_INSTALL_FILE} $$f ${HOST_INCSDIR}/compat/$$f ; \
done)
# Install defs.mk in ${TOOLDIR}/share/compat
install.defs.mk: .PHONY ${HOST_SHAREDIR}/compat/defs.mk