diff options
| author | Eric Blake <ebb9@byu.net> | 2008-03-10 06:45:58 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-03-10 06:45:58 -0600 |
| commit | fa7ece650ed440b3c36bd25d971bfdc6e9fc7153 (patch) | |
| tree | 5b74937646d1f7b757657ad4af9a77880483bdc6 | |
| parent | ff87075d2c0465d5426c8004680b033f13ad893e (diff) | |
| download | m4-fa7ece650ed440b3c36bd25d971bfdc6e9fc7153.tar.gz | |
More maintainer fixes.
* GNUmakefile (_created_version_file): Delete, now that VPATH
builds include GNUmakefile.
* configure.ac (AC_INIT): Base version on .tarball-version, not
.version.
Reported by Ralf Wildenhues, fix by Jim Meyering in coreutils.
Signed-off-by: Eric Blake <ebb9@byu.net>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | GNUmakefile | 9 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 10 insertions, 12 deletions
@@ -1,3 +1,12 @@ +2008-03-10 Eric Blake <ebb9@byu.net> + + More maintainer fixes. + * GNUmakefile (_created_version_file): Delete, now that VPATH + builds include GNUmakefile. + * configure.ac (AC_INIT): Base version on .tarball-version, not + .version. + Reported by Ralf Wildenhues, fix by Jim Meyering in coreutils. + 2008-03-06 Eric Blake <ebb9@byu.net> Fix nested builtin(`shift',$@) regression from 2008-02-22. @@ -4861,8 +4870,6 @@ Mon Jan 22 21:08:52 1990 Rene' Seindal (seindal at diku.dk) ----- - $Revision$ $Date$ - Local Variables: coding: utf-8 End: diff --git a/GNUmakefile b/GNUmakefile index 1477e089..ac70f63f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -56,19 +56,10 @@ ifeq (0,$(MAKELEVEL)) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) _dummy := $(shell (cd $(srcdir) && rm -rf autom4te.cache && autoreconf)) - _created_version_file = 1 endif endif endif -ifneq ($(_curr-ver),$(VERSION)) - _dummy := $(shell echo $(_curr-ver) > .version) -endif - -ifneq ($(_created_version_file),1) - _dummy := $(shell test -f .version || echo $(VERSION) > .version) -endif - include $(srcdir)/Makefile.cfg include $(srcdir)/Makefile.maint diff --git a/configure.ac b/configure.ac index a8d92002..aa1f32e2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.60]) -AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .version]), +AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-m4@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) |