Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src reinstall awk.texi.



details:   https://anonhg.NetBSD.org/src/rev/1aa1f62e0fe2
branches:  trunk
changeset: 759579:1aa1f62e0fe2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 13 06:30:44 2010 +0000

description:
reinstall awk.texi.

diffstat:

 distrib/sets/lists/man/mi             |   4 ++--
 external/historical/nawk/bin/Makefile |  16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r a428205d8097 -r 1aa1f62e0fe2 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Dec 13 06:21:53 2010 +0000
+++ b/distrib/sets/lists/man/mi Mon Dec 13 06:30:44 2010 +0000
@@ -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
diff -r a428205d8097 -r 1aa1f62e0fe2 external/historical/nawk/bin/Makefile
--- a/external/historical/nawk/bin/Makefile     Mon Dec 13 06:21:53 2010 +0000
+++ b/external/historical/nawk/bin/Makefile     Mon Dec 13 06:30:44 2010 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index