Module Name: src
Committed By: apb
Date: Sun Dec 2 12:44:07 UTC 2012
Modified Files:
src/tools/host-mkdep: Makefile
Log Message:
Now that tools/Makefile builds tools/binstall before installing
tools/host-mkdep, we can use the newly-built install program
to install host-mkdep.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tools/host-mkdep/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/host-mkdep/Makefile
diff -u src/tools/host-mkdep/Makefile:1.11 src/tools/host-mkdep/Makefile:1.12
--- src/tools/host-mkdep/Makefile:1.11 Sun Dec 2 12:21:51 2012
+++ src/tools/host-mkdep/Makefile Sun Dec 2 12:44:06 2012
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2012/12/02 12:21:51 apb Exp $
+# $NetBSD: Makefile,v 1.12 2012/12/02 12:44:06 apb Exp $
-TIMESTAMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
+HOSTPROG= host-mkdep
+HOSTPROGNAME= ${_TOOL_PREFIX}host-mkdep
+HOST_BINDIR= ${TOOLDIR}/bin
+
+NOMAN= # defined
+SRCS= # empty
CLEANFILES+= config.cache config.log config.status host-mkdep
@@ -20,12 +25,24 @@ host-mkdep: configure host-mkdep.in
${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
chmod +x $@
-# This is the only program that comes before binstall.
-install: ${TIMESTAMP}
-${TIMESTAMP}: host-mkdep
- mkdir -p ${TOOLDIR}/bin
- cp host-mkdep $@
- chmod +x $@
+# Use uninstalled copy of the install program
+INSTALL_OBJ!= cd ${NETBSDSRCDIR}/tools/binstall && ${PRINTOBJDIR}
+INSTALL= ${INSTALL_OBJ}/xinstall
+
+# Install rule, copied from src/tools/Makefile.host.
+# We can't include Makefile.host because there is no HOST_SRCDIR
+# corresponding to host-mkdep.
+#
+realinstall: install.host
+install.host: ${HOST_BINDIR}/${HOSTPROGNAME}
+${HOST_BINDIR}/${HOSTPROGNAME}:: ${HOSTPROG}
+ ${_MKTARGET_INSTALL}
+ mkdir -p ${HOST_BINDIR}
+ ${HOST_INSTALL_FILE} -m ${BINMODE} ${HOSTPROG}${HOSTEXEEXT} ${.TARGET}
+
+.if ${MKUPDATE} == "no"
+.PHONY: ${HOST_BINDIR}/${HOSTPROGNAME}
+.endif
# Run by hand, then "configure" script committed:
regen:
