Fix vms version stuff. Get the tarball really right.

18 files changed, 51 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 325707a6..bf0f749b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.0.
+	* 4.0.0: Remake the tar ball.
+
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure.ac: Update version to 4.0.0.
diff --git a/Makefile.am b/Makefile.am
index d08ff172..855a5e7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
 EXTRA_DIST = \
+	ChangeLog.0 \
 	COPYING \
 	FUTURES \
 	INSTALL \
diff --git a/Makefile.in b/Makefile.in
index 4feab746..2801c612 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,6 +312,7 @@ AM_MAKEFLAGS = 'CFLAGS=$(CFLAGS)' 'LDFLAGS=$(LDFLAGS)'
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
 EXTRA_DIST = \
+	ChangeLog.0 \
 	COPYING \
 	FUTURES \
 	INSTALL \
diff --git a/awklib/ChangeLog b/awklib/ChangeLog
index 8aaeb418..2ae225be 100644
--- a/awklib/ChangeLog
+++ b/awklib/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.0.
+	* 4.0.0: Remake the tar ball.
+
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* ChangeLog.0: Rotated ChangeLog into this file.
diff --git a/awklib/Makefile.am b/awklib/Makefile.am
index 6801af28..4ff14036 100644
--- a/awklib/Makefile.am
+++ b/awklib/Makefile.am
@@ -23,7 +23,7 @@
 
 ## process this file with automake to produce Makefile.in
 
-EXTRA_DIST = ChangeLog extract.awk eg $(srcdir)/stamp-eg
+EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
 # With some locales, the script extract.awk fails.
 # So we fix the locale to some sensible value.
 AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
diff --git a/awklib/Makefile.in b/awklib/Makefile.in
index f853f0ce..f61f7de6 100644
--- a/awklib/Makefile.in
+++ b/awklib/Makefile.in
@@ -244,7 +244,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ChangeLog extract.awk eg $(srcdir)/stamp-eg
+EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg
 # With some locales, the script extract.awk fails.
 # So we fix the locale to some sensible value.
 AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8aaeb418..2ae225be 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.0.
+	* 4.0.0: Remake the tar ball.
+
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* ChangeLog.0: Rotated ChangeLog into this file.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 364d1b71..744b70a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,7 @@ info_TEXINFOS = gawk.texi gawkinet.texi
 
 man_MANS = gawk.1 igawk.1
 
-EXTRA_DIST = ChangeLog README.card ad.block setter.outline \
+EXTRA_DIST = ChangeLog ChangeLog.0 README.card ad.block setter.outline \
 	awkcard.in awkforai.txt texinfo.tex cardfonts \
 	general-program.eps general-program.fig general-program.pdf \
 	process-flow.eps process-flow.fig process-flow.pdf \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 33bebfc4..7b27836c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -242,7 +242,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 info_TEXINFOS = gawk.texi gawkinet.texi
 man_MANS = gawk.1 igawk.1
-EXTRA_DIST = ChangeLog README.card ad.block setter.outline \
+EXTRA_DIST = ChangeLog ChangeLog.0 README.card ad.block setter.outline \
 	awkcard.in awkforai.txt texinfo.tex cardfonts \
 	general-program.eps general-program.fig general-program.pdf \
 	process-flow.eps process-flow.fig process-flow.pdf \
diff --git a/po/ChangeLog b/po/ChangeLog
index 8aaeb418..d5b5fd5c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
+	* Makefile.in.in (dist2): Add README to list of files checked for
+	manually.
+	* 4.0.0: Remake the tar ball.
+
+2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
+
 	* ChangeLog.0: Rotated ChangeLog into this file.
 	* ChangeLog: Created anew for gawk 4.0.0 and on.
 	* 4.0.0: Release tar ball made.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 83d8838a..d497db4c 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -363,6 +363,9 @@ dist2: stamp-po $(DISTFILES)
 	if test -f $(srcdir)/$(DOMAIN).pot; then \
 	  dists="$$dists $(DOMAIN).pot stamp-po"; \
 	fi; \
+	if test -f $(srcdir)/README; then \
+	  dists="$$dists README"; \
+	fi; \
 	if test -f $(srcdir)/ChangeLog; then \
 	  dists="$$dists ChangeLog"; \
 	fi; \
diff --git a/test/ChangeLog b/test/ChangeLog
index 8aaeb418..2ae225be 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): Add ChangeLog.0.
+	* 4.0.0: Remake the tar ball.
+
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* ChangeLog.0: Rotated ChangeLog into this file.
diff --git a/test/Makefile.am b/test/Makefile.am
index 9e66a8f1..2d7bf34f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,6 +26,7 @@
 EXTRA_DIST = \
 	reg \
 	lib \
+	ChangeLog.0 \
 	Gentests \
 	Gentests.vms \
 	Maketests \
diff --git a/test/Makefile.in b/test/Makefile.in
index 3399016b..04ea041c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -211,6 +211,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	reg \
 	lib \
+	ChangeLog.0 \
 	Gentests \
 	Gentests.vms \
 	Maketests \
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 8aaeb418..9fe0f0f0 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-24         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* vmsbuild.com (REL, PATCHLVL): Move to 4.0.0.
+	* descrip.mms (REL, PATCHLVL): Move to 4.0.0.
+	* vms-conf.h (VERSION, PACKAGE_VERSION): Move to 4.0.0.
+	* 4.0.0: Remake the tar ball.
+
 2011-06-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* ChangeLog.0: Rotated ChangeLog into this file.
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 076b94b4..967a312e 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -138,8 +138,8 @@ VMSOTHR = $(VMSDIR)descrip.mms,$(VMSDIR)vmsbuild.com,$(VMSDIR)version.com,\
 DOCS= $(DOCDIR)gawk.1,$(DOCDIR)gawk.texi,$(DOCDIR)texinfo.tex
 
 # Release of gawk
-REL=3.1
-PATCHLVL=8
+REL=4.0
+PATCHLVL=0
 
 # generic target
 all : gawk,pgawk,dgawk
diff --git a/vms/vms-conf.h b/vms/vms-conf.h
index 705323ad..183b7245 100644
--- a/vms/vms-conf.h
+++ b/vms/vms-conf.h
@@ -402,7 +402,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.1.8"
+#define PACKAGE_VERSION "4.0.0"
 
 /* Define to 1 if *printf supports %F format */
 #undef PRINTF_HAS_F_FORMAT
@@ -435,7 +435,7 @@
 #define USE_INCLUDED_STRFTIME 1
 
 /* Version number of package */
-#define VERSION "3.1.8"
+#define VERSION "4.0.0"
 
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index d3efc3b8..0ad0d3d0 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -9,9 +9,10 @@ $!						gawk 3.1.0 revised, Mar'01
 $!						gawk 3.1.1 revised, Apr'02
 $!						gawk 3.1.6 revised, Mar'07
 $!						gawk-bytecode revd, Jan'10
+$!						gawk 4.0.0 revd, May'11
 $!
-$ REL = "3.1"	!release version number
-$ PATCHLVL = "8"
+$ REL = "4.0"	!release version number
+$ PATCHLVL = "0"
 $!
 $!
 $ CCFLAGS = "/noList"	! "/noOpt/Debug"