Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/compat restore the find loop to include files generate...



details:   https://anonhg.NetBSD.org/src/rev/ced0aa42b97d
branches:  trunk
changeset: 783174:ced0aa42b97d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 09 23:18:30 2012 +0000

description:
restore the find loop to include files generated by configure

diffstat:

 tools/compat/Makefile |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r 22ff0cc7f12e -r ced0aa42b97d tools/compat/Makefile
--- a/tools/compat/Makefile     Sun Dec 09 22:12:26 2012 +0000
+++ b/tools/compat/Makefile     Sun Dec 09 23:18:30 2012 +0000
@@ -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 @@
        @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 @@
 
 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_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 @@
 
 # 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



Home | Main Index | Thread Index | Old Index