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 2703d7f76fe5fffe7372901bae45fe6aa9e4ea01..006f8fe3a3fc991a641b1fdae66da3cc46cb8433 100644 (file)
--- 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 (file)
index 0000000..d78bda9
--- /dev/null
+++ b/.version.in
@@ -0,0 +1 @@
+@VERSION@

diff --git a/ChangeLog b/ChangeLog
index 79be1a061a315c47c20297d5c361fd751e98791a..7491bb03d3f1bff050727eca566bf397aeeb8d34 100644 (file)
--- 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 fe6e2d3171731871e19cfc2deff2eb90f57b08a9..adf893487558faa405dfddca3c5bf3a871f30e1b 100644 (file)
--- 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 46f67fc03cf161cb060bcf44a7b25dd94b5b2e71..a8ef1884d892380bf1321bf78639d887880b9eec 100644 (file)
--- 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 5e4da1ff6d2682eb970a76edf5b35f0e3ff61806..5db7ed2210508aae5f358a8f579aea6220a9b330 100644 (file)
--- 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