From: Joel E. Denny <jdenny@ces.clemson.edu>
Date: Mon, 21 Apr 2008 00:35:54 +0000 (+0000)
Subject: Fix make dist infinite loop reported by Juan Manuel Guerrero at
X-Git-Tag: v2.3b~16
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/74c52fc8407ddc0300ac9ddc3467b72872a83810

Fix make dist infinite loop reported by Juan Manuel Guerrero at
<http://lists.gnu.org/archive/html/bug-bison/2008-01/msg00009.html>.
* .cvsignore: Add .version.
* .version.in: New.
* bootstrap.conf (gnulib_modules): Add git-version-gen.
* configure.ac (AC_CONFIG_FILES): Add .version.
* build-aux/.cvsignore: Add git-version-gen.
---

diff --git a/.cvsignore b/.cvsignore
index 2703d7f7..006f8fe3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,6 +2,7 @@
 *.flc
 *.patch *.log log patches applied
 *.prj
+.version
 ABOUT-NLS
 COPYING
 INSTALL
diff --git a/.version.in b/.version.in
new file mode 100644
index 00000000..d78bda93
--- /dev/null
+++ b/.version.in
@@ -0,0 +1 @@
+@VERSION@
diff --git a/ChangeLog b/ChangeLog
index 79be1a06..7491bb03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-20  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	Fix make dist infinite loop reported by Juan Manuel Guerrero at
+	<http://lists.gnu.org/archive/html/bug-bison/2008-01/msg00009.html>.
+	* .cvsignore: Add .version.
+	* .version.in: New.
+	* bootstrap.conf (gnulib_modules): Add git-version-gen.
+	* configure.ac (AC_CONFIG_FILES): Add .version.
+	* build-aux/.cvsignore: Add git-version-gen.
+
 2008-03-08  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	* NEWS (2.3a+): Mention that -g now takes an argument.
diff --git a/bootstrap.conf b/bootstrap.conf
index fe6e2d31..adf89348 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -18,7 +18,7 @@
 # gnulib modules used by this package.
 gnulib_modules='
 	argmatch config-h c-strcase configmake
-	dirname error extensions fopen-safer
+	dirname error extensions fopen-safer git-version-gen
 	getopt gettext hash inttypes javacomp-script javaexec-script malloc
 	mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
 	strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 46f67fc0..a8ef1884 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -5,6 +5,7 @@ config.guess
 config.rpath
 config.sub
 depcomp
+git-version-gen
 install-sh
 javacomp.sh.in
 javaexec.sh.in
diff --git a/configure.ac b/configure.ac
index 5e4da1ff..5db7ed22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,8 @@ AC_SUBST([O0CXXFLAGS], [`echo $CXXFLAGS | sed 's/-O[[0-9]] *//'`])
 gt_JAVACOMP([1.3])
 gt_JAVAEXEC
 
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([.version
+		 Makefile
 		 build-aux/Makefile
 		 po/Makefile.in
 		 data/Makefile