Move to gawk-2.15.2.gawk-2.15.2

5 files changed, 67 insertions, 37 deletions

diff --git a/FUTURES b/FUTURES
index da714318..b0965604 100644
--- a/FUTURES
+++ b/FUTURES
@@ -81,6 +81,15 @@ David:
 
 For 2.19 or later:
 ==================
+Add variables similar to C's __FILE__ and __LINE__ for better diagnostics
+from within awk programs.
+
+Add an explicit concatenation operator and assignment version.
+
+? Add a switch statement
+
+Add the ability to seek on an open file and retrieve the current file position.
+
 Add lint checking everywhere, including check for use of builtin vars.
 only in new awk.
 
diff --git a/Makefile.in b/Makefile.in
index b32caf44..816889b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,10 +127,9 @@ COPIES = missing/system.c missing/tzset.c \
 
 SUPPORT = support/texindex.c support/texinfo.tex
 
-DOCS= gawk.1 gawk.texi
+DOCS= gawk.1 gawk.texi gawk.info
 
-INFOFILES= gawk.info gawk.info-* \
-	   gawk.aux gawk.cp gawk.cps gawk.fn gawk.fns gawk.ky gawk.kys \
+TEXFILES= gawk.aux gawk.cp gawk.cps gawk.fn gawk.fns gawk.ky gawk.kys \
 	   gawk.pg gawk.pgs gawk.toc gawk.tp gawk.tps gawk.vr gawk.vrs
 
 MISC =	NEWS COPYING FUTURES Makefile.* PROBLEMS README* PORTS POSIX \
@@ -138,10 +137,7 @@ MISC =	NEWS COPYING FUTURES Makefile.* PROBLEMS README* PORTS POSIX \
 
 OTHERS= pc/* atari/* vms/*
 
-ALLDOC= gawk.dvi $(INFOFILES)
-
-ALLFILES= $(AWKSRC) $(GNUSRC) $(COPIES) $(MISC) $(DOCS) $(ALLDOC) $(OTHERS) \
-	  $(SUPPORT)
+ALLDOC= gawk.dvi $(TEXFILES) gawk.info*
 
 # Release of gawk.  There can be no leading or trailing white space here!
 REL=2.15
@@ -170,7 +166,7 @@ config.h:	config.in
 	@echo Run \"./configure\" to build it for known systems
 	@echo or copy config.in to config.h and edit it.; exit 1
 
-install:	gawk
+install:	gawk gawk.info
 	cp gawk $(bindir) && chmod 755 $(bindir)/gawk
 	cp gawk.1 $(mandir)/gawk$(manext) && chmod 644 $(mandir)/gawk$(manext)
 	cp gawk.info* $(infodir) && chmod 644 $(infodir)/gawk.info*
@@ -228,36 +224,30 @@ gawk.dvi:	gawk.texi
 gawk.info:	gawk.texi
 	makeinfo gawk.texi
 
-gawk-test-$(REL).tar.z::
-	-rm -f gawk-test-$(REL).tar.z
-	tar -cf - test | gzip >gawk-test-$(REL).tar.z
-
-dist:	$(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) $(COPIES) $(SUPPORT) clean
-	./configure msdos
-	mv config.h pc
-	-rm -rf gawk-$(REL) gawk-$(REL).*.tar.z
-	-mkdir gawk-$(REL)
-	cp -p $(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) gawk-$(REL)
-	-mkdir gawk-$(REL)/missing
-	cp -p $(COPIES) gawk-$(REL)/missing
-	-mkdir gawk-$(REL)/atari
-	cp -p  atari/* gawk-$(REL)/atari
-	-mkdir gawk-$(REL)/pc
-	cp -p pc/* gawk-$(REL)/pc
-	-mkdir gawk-$(REL)/vms
-	cp -p vms/* gawk-$(REL)/vms
-	-mkdir gawk-$(REL)/config
-	cp -p config/* gawk-$(REL)/config
-	-mkdir gawk-$(REL)/support
-	cp -p support/* gawk-$(REL)/support
-	mv test gawk-$(REL)
-	tar -cf - gawk-$(REL) | gzip > gawk-$(REL).`gawk '{print $$3}' patchlevel.h`.tar.z
-	mv gawk-$(REL)/test .
+dist:	$(AWKSRC) $(GNUSRC) $(DOCS) $(MISC) $(COPIES) $(SUPPORT) distclean
+	-rm -rf gawk-$(REL)*
+	dir=gawk-$(REL).`gawk '{print $$3}' patchlevel.h` && \
+	./configure msdos && \
+	mv config.h pc && \
+	mkdir $$dir && \
+	cp -p $(AWKSRC) $(GNUSRC) $(DOCS) gawk.info-* $(MISC) $$dir && \
+	mkdir $$dir/missing && cp -p $(COPIES) $$dir/missing && \
+	mkdir $$dir/atari && cp -p  atari/* $$dir/atari && \
+	mkdir $$dir/pc && cp -p pc/* $$dir/pc && \
+	mkdir $$dir/vms && cp -p vms/* $$dir/vms && \
+	mkdir $$dir/config && cp -p config/* $$dir/config && \
+	mkdir $$dir/support && cp -p support/* $$dir/support && \
+	mv test $$dir && \
+	chmod -R a-w $$dir && \
+	cd $$dir && chmod u+w . test missing atari pc vms config support && \
+	cd .. && \
+	tar -cf - $$dir | gzip > $$dir.tar.z && \
+	mv $$dir/test .
 
 gawk-doc-$(REL).tar.z:	gawk.info gawk.dvi gawk.1
 	-rm -rf gawk-doc-$(REL) gawk-doc-$(REL).tar.z
 	-mkdir gawk-doc-$(REL)
-	cp -p $(INFOFILES) gawk.dvi gawk-doc-$(REL)
+	cp -p gawk.dvi gawk-doc-$(REL)
 	nroff -man gawk.1 > gawk-doc-$(REL)/gawk.1.pr
 	tar -cf - gawk-doc-$(REL) | gzip > gawk-doc-$(REL).tar.z
 
@@ -268,8 +258,7 @@ gawk-ps-$(REL).tar.z:	gawk.dvi gawk.1
 	pstroff -man gawk.1 > gawk-ps-$(REL)/gawk.1.ps
 	tar -cf - gawk-ps-$(REL) | gzip > gawk-ps-$(REL).tar.z
 
-release:	gawk-src-$(REL).tar.z gawk-doc-$(REL).tar.z gawk-ps-$(REL).tar.z \
-	 gawk-test-$(REL).tar.z
+release:	dist gawk-doc-$(REL).tar.z gawk-ps-$(REL).tar.z
 
 test:	gawk
 	cd test; make -k
diff --git a/NEWS b/NEWS
index 8ef69710..6711373d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Changes from 2.15.1 to 2.15.2
+---------------------------
+
+Additions to the FUTURES file.
+
+Document undefined order of output when using both standard output
+  and /dev/stdout or any of the /dev output files that gawk emulates in
+  the absence of OS support.
+
+Clean up the distribution generation in Makefile.in:  the info files are
+  now included, the distributed files are marked read-only and patched
+  distributions are now unpacked in a directory named with the patch level.
+
+
 Changes from 2.15 to 2.15.1
 ---------------------------
 
diff --git a/gawk.1 b/gawk.1
index 79f3df81..0338485e 100644
--- a/gawk.1
+++ b/gawk.1
@@ -1808,6 +1808,24 @@ The
 .B \-F
 option is not necessary given the command line variable assignment feature;
 it remains only for backwards compatibility.
+.PP
+If your system actually has support for
+.B /dev/fd
+and the associated
+.BR /dev/stdin ,
+.BR /dev/stdout ,
+and
+.B /dev/stderr
+files, you may get different output from
+.I gawk
+than you would get on a system without those files.  When
+.I gawk
+interprets these files internally, it synchronizes output to the standard
+output with output to
+.BR /dev/stdout ,
+while on a system with those files, the output is actually to different
+open files.
+Caveat Emptor.
 .SH VERSION INFORMATION
 This man page documents
 .IR gawk ,
diff --git a/patchlevel.h b/patchlevel.h
index 131713a8..c6161a1f 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1 +1 @@
-#define PATCHLEVEL	1
+#define PATCHLEVEL	2