Module Name: src
Committed By: rillig
Date: Thu Dec 5 22:40:02 UTC 2024
Modified Files:
src/bin/ksh: Makefile
Log Message:
ksh: clean up Makefile
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/bin/ksh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/Makefile
diff -u src/bin/ksh/Makefile:1.37 src/bin/ksh/Makefile:1.38
--- src/bin/ksh/Makefile:1.37 Sat Jun 3 21:30:20 2023
+++ src/bin/ksh/Makefile Thu Dec 5 22:40:02 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2023/06/03 21:30:20 lukem Exp $
+# $NetBSD: Makefile,v 1.38 2024/12/05 22:40:02 rillig Exp $
-WARNS=3
+WARNS= 3
CWARNFLAGS.clang+= -Wno-error=cast-qual
.include <bsd.own.mk>
@@ -13,12 +13,11 @@ SRCS= alloc.c c_ksh.c c_sh.c c_test.c c_
main.c misc.c path.c shf.c syn.c table.c trap.c tree.c tty.c \
var.c version.c vi.c
DPSRCS= emacs.out siglist.out
-.if (${MKMAN} != "no")
+.if ${MKMAN} != "no"
DPSRCS+=ksh.1
.endif
-# needs tbl for the man page.
-USETBL=
+USETBL= # yes, needed for the man page.
# Environment for scripts executed during build.
SCRIPT_ENV= \
@@ -30,7 +29,8 @@ CLEANFILES+= siglist.out siglist.out.tmp
siglist.out: config.h sh.h siglist.in siglist.sh
${_MKTARGET_CREATE}
${SCRIPT_ENV} \
- ${HOST_SH} $(.CURDIR)/siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(.CURDIR)" < $(.CURDIR)/siglist.in > siglist.out.tmp \
+ ${HOST_SH} ${.CURDIR}/siglist.sh "${CC} -E ${CPPFLAGS} ${DEFS} \
+ -I. -I${.CURDIR}" < ${.CURDIR}/siglist.in > siglist.out.tmp \
&& mv siglist.out.tmp siglist.out
# two steps to prevent the creation of a bogus emacs.out
@@ -38,14 +38,14 @@ CLEANFILES+= emacs.out emacs.out.tmp
emacs.out: emacs.c
${_MKTARGET_CREATE}
${SCRIPT_ENV} \
- ${HOST_SH} $(.CURDIR)/emacs-gen.sh $(.CURDIR)/emacs.c > emacs.out.tmp \
+ ${HOST_SH} ${.CURDIR}/emacs-gen.sh ${.CURDIR}/emacs.c > emacs.out.tmp \
&& mv emacs.out.tmp emacs.out
CLEANFILES+= ksh.1 ksh.1.tmp
ksh.1: ksh.Man mkman
${_MKTARGET_CREATE}
${SCRIPT_ENV} \
- ${HOST_SH} $(.CURDIR)/mkman ksh $(.CURDIR)/ksh.Man >ksh.1.tmp \
+ ${HOST_SH} ${.CURDIR}/mkman ksh ${.CURDIR}/ksh.Man >ksh.1.tmp \
&& mv ksh.1.tmp ksh.1
COPTS+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
