[src/trunk]: src/tools replace DIST with GNUHOSTDIST, and don't unconditional...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/716557ea78fd
branches:  trunk
changeset: 542785:716557ea78fd
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Feb 07 01:52:51 2003 +0000

description:
replace DIST with GNUHOSTDIST, and don't unconditionally define it
in Makefile.gnuhost (use ?= instead of =, to allow overriding)

diffstat:

 tools/Makefile.gnuhost   |  8 ++++----
 tools/groff/Makefile     |  4 ++--
 tools/toolchain/Makefile |  4 ++--
 tools/toolchain/mknative |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (91 lines):

diff -r 5aee771fcbaf -r 716557ea78fd tools/Makefile.gnuhost
--- a/tools/Makefile.gnuhost    Fri Feb 07 00:46:08 2003 +0000
+++ b/tools/Makefile.gnuhost    Fri Feb 07 01:52:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gnuhost,v 1.16 2002/02/26 22:27:11 tv Exp $
+#      $NetBSD: Makefile.gnuhost,v 1.17 2003/02/07 01:52:51 lukem Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -17,7 +17,7 @@
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../gnu/dist/${MODULE}
+GNUHOSTDIST?=  ${.CURDIR}/../../gnu/dist/${MODULE}
 
 FIND_ARGS+=    \! \( -type d \( \
                        -name 'CVS' -o \
@@ -33,7 +33,7 @@
     (make(all) || make(realall) || (!make(clean) && !make(cleandir) && !make(obj))) && \
     !defined(_GNU_CFGSRC)
 
-_GNU_CFGSRC!=  find ${DIST} ${FIND_ARGS} \
+_GNU_CFGSRC!=  find ${GNUHOSTDIST} ${FIND_ARGS} \
                -type f \( -name 'config*' -o -name '*.in' \) -print
 .MAKEOVERRIDES+= _GNU_CFGSRC
 .endif
@@ -64,7 +64,7 @@
 
 .configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
        @mkdir build 2>/dev/null || true
-       @(cd build && ${CONFIGURE_ENV} sh ${DIST}/configure ${CONFIGURE_ARGS})
+       @(cd build && ${CONFIGURE_ENV} sh ${GNUHOSTDIST}/configure ${CONFIGURE_ARGS})
        @touch $@
 
 # The .build_done timestamp is only updated if a file actually changes
diff -r 5aee771fcbaf -r 716557ea78fd tools/groff/Makefile
--- a/tools/groff/Makefile      Fri Feb 07 00:46:08 2003 +0000
+++ b/tools/groff/Makefile      Fri Feb 07 01:52:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2002/12/08 20:20:00 thorpej Exp $
+#      $NetBSD: Makefile,v 1.17 2003/02/07 01:52:53 lukem Exp $
 
 MODULE=                groff
 
@@ -50,7 +50,7 @@
 .endfor
 
 afterinstall: ${TMACDIR}/tmac.an.old
-${TMACDIR}/tmac.an.old: ${DIST}/tmac/tmac.an _installtmac
+${TMACDIR}/tmac.an.old: ${GNUHOSTDIST}/tmac/tmac.an _installtmac
 .ORDER: realinstall ${TMACDIR}/tmac.an.old
 
 afterinstall: ${TMACDIR}/tmac.an
diff -r 5aee771fcbaf -r 716557ea78fd tools/toolchain/Makefile
--- a/tools/toolchain/Makefile  Fri Feb 07 00:46:08 2003 +0000
+++ b/tools/toolchain/Makefile  Fri Feb 07 01:52:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2002/12/08 20:20:05 thorpej Exp $
+#      $NetBSD: Makefile,v 1.23 2003/02/07 01:52:53 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -53,7 +53,7 @@
                        gdb_cv_printf_has_long_double=yes \
                        gdb_cv_printf_has_long_long=yes \
                        gdb_cv_scanf_has_long_double=yes \
-                       sh ${DIST}/configure \
+                       sh ${GNUHOSTDIST}/configure \
                        --build=`${.CURDIR}/../../gnu/dist/toolchain/config.guess` \
                        --host=${MACHINE_GNU_PLATFORM} \
                        --target=${MACHINE_GNU_PLATFORM}) && \
diff -r 5aee771fcbaf -r 716557ea78fd tools/toolchain/mknative
--- a/tools/toolchain/mknative  Fri Feb 07 00:46:08 2003 +0000
+++ b/tools/toolchain/mknative  Fri Feb 07 01:52:51 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative,v 1.8 2002/05/20 15:19:09 thorpej Exp $
+#      $NetBSD: mknative,v 1.9 2003/02/07 01:52:54 lukem Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/toolchain.
@@ -16,7 +16,7 @@
        $MAKE -f - _x_ <<EOF || bomb "getvars $_mf $* failed"
 _x_:
 .for var in $*
-       @echo G_\${var}=\${\${var}:Q} | sed 's,$_VPATH,\$\${DIST},g'
+       @echo G_\${var}=\${\${var}:Q} | sed 's,$_VPATH,\$\${GNUHOSTDIST},g'
 .endfor
 .include "$_TMPDIR/$_mf"
 EOF