Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace DIST with GNUHOSTDIST, and don't unconditionally define it 

in Makefile.gnuhost (use ?= instead of =, to allow overriding)
This commit is contained in:
lukem 2003-02-07 01:52:51 +00:00
parent 53d3dabb6a
commit 27c21a917d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/Makefile.gnuhost
View File

@ -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 @@ FIND_ARGS+= \! \( -type d \( \
(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 @@ INSTALL_TARGET?=install
.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

4
tools/groff/Makefile
View File

@ -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 @@ ${TMACDIR}/tmac.${F}: ${F} _installtmac
.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

4
tools/toolchain/Makefile
View File

@ -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 @@ native: .native/.configure_done
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}) && \

4
tools/toolchain/mknative
View File

@ -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 @@ getvars () {
$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