Skip to content

Commit

Permalink
Use ${TOOL_AWK} instead of ${AWK} or plain "awk" in make commands.
Browse files Browse the repository at this point in the history
Pass AWK=${TOOL_AWK:Q} to shell scripts that use awk.
  • Loading branch information
apb committed Oct 19, 2008
1 parent 11b85bc commit 26fe228
Show file tree
Hide file tree
Showing 51 changed files with 177 additions and 147 deletions.
14 changes: 9 additions & 5 deletions bin/sh/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.81 2007/03/25 06:30:37 apb Exp $
# $NetBSD: Makefile,v 1.82 2008/10/19 22:05:19 apb Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95

.include <bsd.own.mk>
Expand All @@ -23,6 +23,10 @@ DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
LFLAGS= -8 # 8-bit lex scanner for arithmetic
YFLAGS= -d

# Environment for scripts executed during build.
SCRIPT_ENV= \
AWK=${TOOL_AWK:Q} \

# The .depend file can get references to these temporary files
.OPTIONAL: lex.yy.c y.tab.c

Expand Down Expand Up @@ -52,25 +56,25 @@ CLEANFILES+= trace

token.h: mktokens
${_MKTARGET_CREATE}
${HOST_SH} ${.ALLSRC}
${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC}

builtins.h: builtins.c
${_MKTARGET_CREATE}

builtins.c: mkbuiltins shell.h builtins.def
${_MKTARGET_CREATE}
${HOST_SH} ${.ALLSRC} ${.OBJDIR}
${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} ${.OBJDIR}
[ -f builtins.h ]

init.c: mkinit.sh ${SHSRCS}
${_MKTARGET_CREATE}
${HOST_SH} ${.ALLSRC}
${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC}

nodes.h: nodes.c

nodes.c: mknodes.sh nodetypes nodes.c.pat
${_MKTARGET_CREATE}
${HOST_SH} ${.ALLSRC} ${.OBJDIR}
${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} ${.OBJDIR}
[ -f nodes.h ]

.if ${USETOOLS} == "yes"
Expand Down
3 changes: 2 additions & 1 deletion crypto/dist/openssl/crypto/rc4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ rc4-ia64.S: asm/rc4-ia64.pl
$(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@

rc4-ia64.s: rc4-ia64.S
@case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
@case `${TOOL_AWK} '/^#define RC4_INT/{print$$NF}' \
$(TOP)/include/openssl/opensslconf.h` in \
int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \
char) set -x; $(CC) $(CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \
*) exit 1 ;; \
Expand Down
4 changes: 2 additions & 2 deletions distrib/acorn32/stand/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2008/06/23 02:16:53 matt Exp $
# $NetBSD: Makefile,v 1.26 2008/10/19 22:05:19 apb Exp $
#

.include <bsd.own.mk>
Expand Down Expand Up @@ -100,7 +100,7 @@ setup_tmp:
settypes: setup_tmp
.for file in ${SETTYPE_FILES}
. if ${SETTYPE_FILE_${file}} == ffb
${AWK} '{ printf "%5d %s\n", FNR * 10, $$0 }' \
${TOOL_AWK} '{ printf "%5d %s\n", FNR * 10, $$0 }' \
< tmp/BtNetBSD/${file} > tmp/BtNetBSD/${file}.tmp
mv tmp/BtNetBSD/${file}.tmp tmp/BtNetBSD/${file}
. endif
Expand Down
3 changes: 2 additions & 1 deletion distrib/common/Makefile.crunch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.crunch,v 1.23 2005/11/10 21:29:37 dsl Exp $
# $NetBSD: Makefile.crunch,v 1.24 2008/10/19 22:05:19 apb Exp $
#
# Makefile snippet to build a crunchgen(1)ed binary from the provided lists
#
Expand Down Expand Up @@ -26,6 +26,7 @@
.if !defined(_MAKEFILE_CRUNCH_)
_MAKEFILE_CRUNCH_=1

CRUNCHENV+= AWK=${TOOL_AWK:Q}

SMALLPROG?= 1
SMALLPROG_INET6?= 0
Expand Down
4 changes: 2 additions & 2 deletions distrib/common/Makefile.parselist
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.parselist,v 1.5 2003/11/14 06:00:34 matt Exp $
# $NetBSD: Makefile.parselist,v 1.6 2008/10/19 22:05:20 apb Exp $
#
# Makefile snippet to setup parselist.awk related variables:
# PARSELISTENV environment variables to pass to parselist.awk
Expand All @@ -22,7 +22,7 @@ PARSELISTENV+= NETBSDSRCDIR=${NETBSDSRCDIR:Q} \
OBJDIR=${.OBJDIR:Q}

PARSELISTDEP= ${DISTRIBDIR}/common/parselist.awk
PARSELIST= ${PARSELISTENV} ${AWK} -f ${PARSELISTDEP}
PARSELIST= ${PARSELISTENV} ${TOOL_AWK} -f ${PARSELISTDEP}


.endif # _MAKEFILE_PARSELIST_
3 changes: 2 additions & 1 deletion distrib/sets/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.61 2008/08/31 00:19:33 lukem Exp $
# $NetBSD: Makefile,v 1.62 2008/10/19 22:05:20 apb Exp $

# The `all' target must appear before bsd.own.mk is pulled in.
all:
Expand All @@ -12,6 +12,7 @@ GREP?= grep
SETSCMD= cd ${.CURDIR} && \
DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
AWK=${TOOL_AWK:Q} \
CKSUM=${TOOL_CKSUM:Q} \
DB=${TOOL_DB:Q} \
HOST_SH=${HOST_SH:Q} \
Expand Down
4 changes: 2 additions & 2 deletions distrib/syspkg/mk/bsd.syspkg.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: bsd.syspkg.mk,v 1.3 2004/03/02 23:25:05 xtraeme Exp $
# $NetBSD: bsd.syspkg.mk,v 1.4 2008/10/19 22:05:20 apb Exp $
#
# This file is derived from:
#
Expand Down Expand Up @@ -98,7 +98,7 @@ PKG_DEINSTALL_FILE= ${PKGDIR}/DEINSTALL
MESSAGE_FILE= ${PKGDIR}/MESSAGE
.endif

AWK?= /usr/bin/awk
AWK?= ${TOOL_AWK:U/usr/bin/awk}
CAT?= /bin/cat
CP?= /bin/cp
DC?= /usr/bin/dc
Expand Down
12 changes: 6 additions & 6 deletions distrib/utils/sysinst/Makefile.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.45 2008/08/29 00:02:22 gmcgarry Exp $
# $NetBSD: Makefile.inc,v 1.46 2008/10/19 22:05:20 apb Exp $
#
# Makefile for sysinst

Expand All @@ -25,7 +25,7 @@ MSG_MD?= msg.md.${SYSINSTLANG}
MENUS_MD?= menus.md.${SYSINSTLANG}

.include <bsd.own.mk> # for mk.conf
.include <bsd.sys.mk> # for HOST_SH
.include <bsd.sys.mk> # for HOST_SH, TOOL_*
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"

_MKSHTARGET_CREATE?= ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}
Expand Down Expand Up @@ -108,24 +108,24 @@ msgtouch: ${DISTRIBVERDEP}
msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch
${_MKTARGET_CREATE}
sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}

menus.def: menus.mi ${MENUS_MD} msgtouch
${_MKTARGET_CREATE}
sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}

sysinstmsgs.fmtcnt: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch msg_defs.h
${_MKTARGET_CREATE}
sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${SYSINSTLANG}} | \
awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${HOST_SH} ${MSG_XLAT_SH} -c > ${.TARGET}

.for LANG in ${LANGUAGES:N${SYSINSTLANG}}
sysinstmsgs.${LANG}: msg.mi.${LANG} ${MSG_MD:S/.${SYSINSTLANG}$/.${LANG}/} msgtouch msg_defs.h sysinstmsgs.fmtcnt
${_MKTARGET_CREATE}
sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${LANG}} | \
awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${HOST_SH} ${MSG_XLAT_SH} -f sysinstmsgs.fmtcnt > ${.TARGET}

DPSRCS+= sysinstmsgs.${LANG}
Expand Down
11 changes: 6 additions & 5 deletions etc/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.358 2008/08/28 07:21:49 lukem Exp $
# $NetBSD: Makefile,v 1.359 2008/10/19 22:05:20 apb Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95

# Environment variables without default values:
Expand Down Expand Up @@ -36,7 +36,7 @@
# For MK* vars
.include <bsd.own.mk>

.include <bsd.sys.mk> # for HOST_SH
.include <bsd.sys.mk> # for HOST_SH, TOOL_AWK, ...
.include <bsd.kernobj.mk> # For KERNSRCDIR, KERNOBJDIR, ...
.include <bsd.endian.mk> # For TARGET_ENDIANNESS

Expand Down Expand Up @@ -172,7 +172,8 @@ MAKEDEV: .EXEC
${_MKTARGET_CREATE}
MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
NETBSDSRCDIR=${NETBSDSRCDIR:Q} \
awk -f ${.CURDIR}/MAKEDEV.awk ${.CURDIR}/MAKEDEV.tmpl > ${.TARGET}
${TOOL_AWK} -f ${.CURDIR}/MAKEDEV.awk ${.CURDIR}/MAKEDEV.tmpl \
> ${.TARGET}

RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
DESTDIR EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
Expand Down Expand Up @@ -402,7 +403,7 @@ distrib-dirs: .PHONY check_DESTDIR
.if ${MKUNPRIVED} != "no" # {
${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist -N ${.CURDIR} \
-p ${DESTDIR}/ -C -k all | \
awk '/ optional/ {next} // {print}' | ${METALOG.add}
${TOOL_AWK} '/ optional/ {next} // {print}' | ${METALOG.add}
.endif # MKUNPRIVED # }
.endif # DISTRIBUTION_DONE # }

Expand Down Expand Up @@ -537,7 +538,7 @@ snap_post: .PHONY .MAKE build_kernelsets build_releasekernels
#
ALL_KERNELS?= ${KERNEL_SETS} ${EXTRA_KERNELS} ${BUILD_KERNELS}

GETKERNELAWK= awk '/^config/ {print $$2; found=1} \
GETKERNELAWK= ${TOOL_AWK} '/^config/ {print $$2; found=1} \
END{ if (found == 0) print "netbsd"; }'

build_kernels: .PHONY
Expand Down
8 changes: 5 additions & 3 deletions etc/etc.sgimips/Makefile.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.17 2008/03/18 04:20:37 lukem Exp $
# $NetBSD: Makefile.inc,v 1.18 2008/10/19 22:05:20 apb Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
Expand All @@ -25,10 +25,12 @@ iso-image-md-pre:
SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips.img

iso-image-md-post:
@SEEK=`awk '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
@SEEK=`${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
${DESTDIR}/usr/include/sys/bootblock.h` ; \
EST=`ls -l ${CDROM.image} \
| awk '{ s += $$5} END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 }'` ; \
| ${TOOL_AWK} '{ s += $$5 } \
END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \
}'` ; \
echo "Estimated image size: $${EST} MB"; \
dd if=/dev/zero of=${SGI.image} bs=1024k count=$${EST}; \
${TOOLDIR}/bin/nbsgivol -f -i ${SGI.image}; \
Expand Down
6 changes: 3 additions & 3 deletions external/bsd/top/bin/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2008/07/17 10:46:56 lukem Exp $
# $NetBSD: Makefile,v 1.2 2008/10/19 22:05:20 apb Exp $

.include <bsd.own.mk>

Expand All @@ -20,8 +20,8 @@ DPADD+= ${LIBTERMCAP} ${LIBM} ${LIBKVM}

sigdesc.h: ${TOPDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h
${_MKTARGET_CREATE}
awk -f ${TOPDIR}/sigconv.awk ${DESTDIR}/usr/include/sys/signal.h > \
${.TARGET}
${TOOL_AWK} -f ${TOPDIR}/sigconv.awk \
${DESTDIR}/usr/include/sys/signal.h > ${.TARGET}
CLEANFILES+= sigdesc.h top.1 config.h

top.1: top.1.in
Expand Down
4 changes: 2 additions & 2 deletions external/mit/xorg/server/drivers/Makefile.xf86-driver
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.xf86-driver,v 1.12 2008/10/13 11:11:35 rtr Exp $
# $NetBSD: Makefile.xf86-driver,v 1.13 2008/10/19 22:05:20 apb Exp $

LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
Expand All @@ -9,7 +9,7 @@ SHLIB_MAJOR= ${PACKAGE_MAJOR}
LIB= ${DRIVER_NAME}
LIBDIR= ${X11USRLIBDIR}/modules/drivers

PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "[0-9]+\\.[0-9]+\\.[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }' \
Expand Down
8 changes: 5 additions & 3 deletions gnu/lib/libgcc4/libgcc/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2008/09/18 12:20:19 skrll Exp $
# $NetBSD: Makefile,v 1.6 2008/10/19 22:05:20 apb Exp $

REQUIRETOOLS= yes
NOLINT= # defined
Expand All @@ -24,7 +24,8 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
.c.so:
${_MKTARGET_COMPILE}
${COMPILE.c} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | ${AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${CC} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
Expand All @@ -37,7 +38,8 @@ CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
.S.so .s.so:
${_MKTARGET_COMPILE}
${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | ${AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
Expand Down
4 changes: 2 additions & 2 deletions gnu/lib/libgcc4/libgcc_s/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2008/09/18 12:20:19 skrll Exp $
# $NetBSD: Makefile,v 1.6 2008/10/19 22:05:20 apb Exp $

REQUIRETOOLS= yes
NOLINT= # defined
Expand Down Expand Up @@ -43,7 +43,7 @@ libgcc.map: ${LIBGCC_S_OBJS} ${G_SHLIB_MKMAP} ${G_SHLIB_MAPFILES}
cat ${G_SHLIB_MAPFILES} | \
sed -e "/^[ ]*#/d" -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \
${CC} ${G_LIBGCC2_CFLAGS} ${G_INCLUDES} -E -xassembler-with-cpp -; \
} | ${AWK} -f ${G_SHLIB_MKMAP} > ${.TARGET}.tmp
} | ${TOOL_AWK} -f ${G_SHLIB_MKMAP} > ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}

.else
Expand Down
8 changes: 5 additions & 3 deletions gnu/lib/libobjc4/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2008/02/09 01:03:38 mrg Exp $
# $NetBSD: Makefile,v 1.11 2008/10/19 22:05:20 apb Exp $

REQUIRETOOLS= yes
NOLINT= # defined
Expand Down Expand Up @@ -97,10 +97,12 @@ CLEANFILES+= cs-tconfig.h tconfig.h unwind.h
# XXX just while all platforms defs.mk are updated..
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
optionlist: ${G_ALL_OPT_FILES} ${LIBOBJCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
${AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} > ${.TARGET}
${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} \
> ${.TARGET}

options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk
${AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/opth-gen.awk \
${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk \
-f ${DIST}/gcc/opth-gen.awk \
< optionlist > ${.TARGET}

CLEANFILES+= options.h optionlist
Expand Down
9 changes: 5 additions & 4 deletions gnu/usr.bin/gcc4/backend/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2008/05/31 16:05:20 christos Exp $
# $NetBSD: Makefile,v 1.12 2008/10/19 22:05:20 apb Exp $

LIBISPRIVATE= yes

Expand Down Expand Up @@ -156,14 +156,14 @@ tm_p.h: Makefile

CLEANFILES+= options.h options.c optionlist
optionlist: ${G_ALL_OPT_FILES} ${GCCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk
${AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} > ${.TARGET}
${TOOL_AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} > ${.TARGET}

options.c: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/optc-gen.awk
${AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/optc-gen.awk \
${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/optc-gen.awk \
-v header_name="config.h system.h coretypes.h tm.h" < optionlist > ${.TARGET}

options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk
${AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/opth-gen.awk \
${TOOL_AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/opth-gen.awk \
< optionlist > ${.TARGET}

options.o: options.c coretypes.h opts.h intl.h
Expand All @@ -176,6 +176,7 @@ auto-build.h: Makefile
rm -rf .ab && \
mkdir .ab && \
(cd .ab && \
AWK=${TOOL_AWK:Q} \
CC=${HOST_CC:Q} \
MAKE=${MAKE:Q} \
CONFIG_SHELL=${HOST_SH:Q} \
Expand Down
7 changes: 4 additions & 3 deletions gnu/usr.bin/groff/src/utils/indxbib/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $NetBSD: Makefile,v 1.5 2008/10/19 22:05:20 apb Exp $

# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $

Expand All @@ -10,10 +10,11 @@ DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}

COMMON_WORDS_FILE!=awk -F\" '/COMMON_WORDS_FILE/ { print $$2 }' ${.CURDIR}/../../include/defs.h

.include <bsd.own.mk>

COMMON_WORDS_FILE!= ${TOOL_AWK} -F\" '/COMMON_WORDS_FILE/ { print $$2 }' \
${.CURDIR}/../../include/defs.h

.if ${MKSHARE} != "no"
FILES=eign
FILESNAME=${COMMON_WORDS_FILE:T}
Expand Down
Loading

0 comments on commit 26fe228

Please sign in to comment.