Module Name: src
Committed By: mrg
Date: Mon Dec 13 06:30:44 UTC 2010
Modified Files:
src/distrib/sets/lists/man: mi
src/external/historical/nawk/bin: Makefile
Log Message:
reinstall awk.texi.
To generate a diff of this commit:
cvs rdiff -u -r1.1265 -r1.1266 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1265 src/distrib/sets/lists/man/mi:1.1266
--- src/distrib/sets/lists/man/mi:1.1265 Sun Dec 12 19:29:23 2010
+++ src/distrib/sets/lists/man/mi Mon Dec 13 06:30:44 2010
@@ -1,11 +1,11 @@
-# $NetBSD: mi,v 1.1265 2010/12/12 19:29:23 pgoyette Exp $
+# $NetBSD: mi,v 1.1266 2010/12/13 06:30:44 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.man man-sys-root
./usr/share/info/am-utils.info man-amd-info info
./usr/share/info/as.info man-computil-info binutils,info
-./usr/share/info/awk.info man-obsolete obsolete
+./usr/share/info/awk.info man-util-info info
./usr/share/info/bfd.info man-computil-info binutils,info
./usr/share/info/binutils.info man-computil-info binutils,info
./usr/share/info/bzip2.info man-obsolete obsolete
Index: src/external/historical/nawk/bin/Makefile
diff -u src/external/historical/nawk/bin/Makefile:1.3 src/external/historical/nawk/bin/Makefile:1.4
--- src/external/historical/nawk/bin/Makefile:1.3 Sun Dec 12 19:01:03 2010
+++ src/external/historical/nawk/bin/Makefile Mon Dec 13 06:30:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/12/12 19:01:03 christos Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/13 06:30:44 mrg Exp $
WARNS?= 4
@@ -20,4 +20,18 @@
COPTS+= -Wno-pointer-sign
.endif
+# info file originally from GNU awk 3.1.3, adjusted for nawk slightly
+.PATH: ${NETBSDSRCDIR}/external/gpl2/gawk/dist
+TEXINFO= awk.info
+
+# During the tools build (from src/tools/awk/Makefile),
+# src/tools/Makefile.host changes .CURDIR back and forth between
+# src/tools/awk and src/usr.bin/awk. For some unknown reason, including
+# bsd.info.mk here leads to the obj dir being created at the wrong time,
+# while .CURDIR is src/usr.bin/awk. Work around the problem by not
+# including bsd.info.mk when MKINFO=no.
+.if ${MKINFO} != "no"
+.include <bsd.info.mk>
+.endif
+
.include <bsd.prog.mk>
