diff options
| author | tv <tv@NetBSD.org> | 2002-01-31 22:43:33 +0000 |
|---|---|---|
| committer | tv <tv@NetBSD.org> | 2002-01-31 22:43:33 +0000 |
| commit | 9fbd88883c38d0c0fbfcbe66d76fe6b0fab3f9de (patch) | |
| tree | ba0b5c4693e010d837ac72c604288b00e83366c4 /tools/Makefile.gnuhost | |
| parent | 95407c5758ea80fc57ab5e021950b3acb7d729fc (diff) | |
Roll in fixes to permit cross-compiling from non-NetBSD hosts. This
round has been tested on Solaris/x86 and Linux hosts.
* Add host tools cap_mkdb, ctags, m4, uudecode.
* Protect __RCSID() and __COPYRIGHT() better.
* Reduce the number of places that need to include "config.h", to keep
sources closer to their "vanilla" versions.
* Add more compat #defines and autoconf-checked functions.
Diffstat (limited to 'tools/Makefile.gnuhost')
| -rw-r--r-- | tools/Makefile.gnuhost | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/Makefile.gnuhost b/tools/Makefile.gnuhost index cf8f2171ac5..2f3636f8778 100644 --- a/tools/Makefile.gnuhost +++ b/tools/Makefile.gnuhost @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gnuhost,v 1.14 2002/01/31 02:42:25 tv Exp $ +# $NetBSD: Makefile.gnuhost,v 1.15 2002/01/31 22:43:44 tv Exp $ # # Rules used when building a GNU host package. Expects MODULE to be set. # @@ -59,7 +59,7 @@ MAKE_ARGS:= -f ${.PARSEDIR}/Makefile.gnuwrap ${MAKE_ARGS} MAKE_ARGS+= _NOWRAPPER=1 .endif -MAKE_ARGS+= LEX=true BISON=true DESTDIR= INSTALL=${HOST_INSTALL_FILE:Q} +MAKE_ARGS+= BISON=true DESTDIR= INSTALL=${HOST_INSTALL_FILE:Q} ALL_TARGET?= all INSTALL_TARGET?=install @@ -75,21 +75,22 @@ INSTALL_TARGET?=install .build_done: .configure_done @(cd build && ${MAKE} ${MAKE_ARGS} ${ALL_TARGET}) - @if [ ! -f .build_done ] || \ - find build -type f -newer .build_done -print | grep '' >/dev/null; \ + @if [ ! -f $@ ] || [ -n "$$(find build -type f -newer .build_done -print)" ]; \ then touch $@; fi .install_done: ${BUILD:D.build_done} .if defined(UPDATE) - @if [ ! -f .install_done ] || [ .build_done -nt .install_done ]; then \ - (cd ${.OBJDIR}/build && ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}); \ + @cd ${.OBJDIR}; \ + if [ ! -f .install_done ] || [ ! -f .build_done ] || \ + [ -n "$$(find .build_done -prune -newer .install_done -print)" ]; then \ + (cd build && ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}); \ fi .else @(cd ${.OBJDIR}/build && ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endif @touch $@ -.PHONY: .build_done +.PHONY: .build_done .install_done # Mapping to standard targets. |
