Module Name: src
Committed By: christos
Date: Sun Dec 9 19:15:49 UTC 2012
Modified Files:
src/tools/compat: Makefile
Log Message:
make this work
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/tools/compat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/Makefile
diff -u src/tools/compat/Makefile:1.63 src/tools/compat/Makefile:1.64
--- src/tools/compat/Makefile:1.63 Sun Dec 9 13:08:08 2012
+++ src/tools/compat/Makefile Sun Dec 9 14:15:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2012/12/09 18:08:08 christos Exp $
+# $NetBSD: Makefile,v 1.64 2012/12/09 19:15:48 christos Exp $
.include <bsd.own.mk>
@@ -94,7 +94,7 @@ HOST_LIBDIR= ${TOOLDIR}/lib
HOST_INCSDIR= ${TOOLDIR}/include
HOST_SHAREDIR= ${TOOLDIR}/share
-install: .PHONY install.lib install.includes install.defs.mk
+install: .PHONY install.lib includes install.defs.mk
# Install lib${HOSTLIB}.a in ${TOOLDIR}/lib
install.lib: .PHONY ${HOST_LIBDIR}/lib${HOSTLIB}.a
@@ -103,17 +103,22 @@ ${HOST_LIBDIR}/lib${HOSTLIB}.a: lib${HOS
${HOST_INSTALL_DIR} ${HOST_LIBDIR}
${HOST_INSTALL_FILE} -m ${LIBMODE} ${.ALLSRC} ${.TARGET}
-# Install include files in ${TOOLDIR}/include/compat
-install.includes: .PHONY
- ${_MKMSG_INSTALL} "${HOST_INCSDIR}/*"
- ${HOST_INSTALL_DIR} ${HOST_INCSDIR}
- ${HOST_INSTALL_DIR} ${HOST_INCSDIR}/compat
+.for _f in ${INCFILES}
+HOST_INCINSTFILES+= ${HOST_INCSDIR}/compat/${_f}
+${HOST_INCSDIR}/compat/${_f}: ${_f}
+ ${_MKTARGET_INSTALL}
+ ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET}
+.endfor
+
.for _d in ${INCSUBDIRS}
- ${HOST_INSTALL_DIR} ${HOST_INCSDIR}/compat/${_d}
+HOST_INCINSTDIRS+= ${HOST_INCSDIR}/compat/${_d}
+${HOST_INCSDIR}/compat/${_d}:
+ ${_MKTARGET_INSTALL}
+ ${HOST_INSTALL_DIR} ${.TARGET}
.endfor
- (cd include && find . -name '*.h' -print | while read f ; do \
- ${HOST_INSTALL_FILE} $$f ${HOST_INCSDIR}/compat/$$f ; \
- done)
+
+# Install include files in ${TOOLDIR}/include/compat
+includes: .PHONY ${HOST_INCINSTDIRS} .WAIT ${HOST_INCINSTFILES}
# Install defs.mk in ${TOOLDIR}/share/compat
install.defs.mk: .PHONY ${HOST_SHAREDIR}/compat/defs.mk
