Re: generate .version in srcdir
Eric Blake <[email protected]>
| Newsgroups | gmane.comp.gnu.m4.patches |
|---|---|
| Message-ID | <[email protected]> |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Jim Meyering on 3/8/2008 6:29 AM: |> this fixes a distcheck failure in branch-1_4. But maybe you're going to |> rewrite GNUmakefile further anyway, in which case you may just want to |> ignore this patch. ;-) | | FYI, a couple days ago I removed those two ifneq clauses | altogether -- from GNUmakefile in coreutils. With the rule | to create .version in Makefile.am, those two were not needed. As such, I'm committing the following. | | There has been enough churn on this GNUmakefile that it probably | belongs in gnulib. Then bootstrap could copy it from e.g., | build-aux/ (though maybe with a different name) to top-level GNUmakefile. I think that would be worthwhile. Either copy/move it during bootstrap, or check in a symlink that points to build-aux/GNUmakefile where gnulib-tool/bootstrap dumps the original. - -- Don't work too hard, make some time for fun as well! Eric Blake [email protected] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkfVLosACgkQ84KuGfSFAYD0SACghecjWg/CdnP0Rwz8fYRQfyib BQgAnidWztcM6HhwbvJwweGtQS1JlCAd =LvQZ -----END PGP SIGNATURE----- _______________________________________________ M4-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/m4-patches
m4.patch327
(text/plain, 2.3 KB)
From fa7ece650ed440b3c36bd25d971bfdc6e9fc7153 Mon Sep 17 00:00:00 2001 From: Eric Blake <[email protected]> Date: Mon, 10 Mar 2008 06:45:58 -0600 Subject: [PATCH] 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 <[email protected]> --- ChangeLog | 11 +++++++++-- GNUmakefile | 9 --------- configure.ac | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa9745a..164d147 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-10 Eric Blake <[email protected]> + + 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 <[email protected]> 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 1477e08..ac70f63 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 a8d9200..aa1f32e 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]), [[email protected]]) AC_CONFIG_AUX_DIR([build-aux]) -- 1.5.4