[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-347-ga9fac8d
From: |
Peter Rosin |
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-347-ga9fac8d |
Date: |
Tue, 01 Jan 2013 18:41:42 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via a9fac8df4df005dd03740675fa944107b9792adf (commit)
via 8b6f961a68c73fc7d6c61ef9cd55ffa41dbbf028 (commit)
from e54f2dc19b965e57555974561059d2be0a070f8b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a9fac8df4df005dd03740675fa944107b9792adf
Author: Peter Rosin <address@hidden>
Date: Tue Jan 1 19:40:57 2013 +0100
maint: check if git works before relying on it
Makefile.am (m4/ltversion.m4): Take the opportunity to regenerate
$(srcdir)/.serial whenever git is actually working.
(git_version_gen): Provide a fallback version for the git-version-gen
script to use when .tarball-version does not exist and git is not
working.
Signed-off-by: Peter Rosin <address@hidden>
commit 8b6f961a68c73fc7d6c61ef9cd55ffa41dbbf028
Author: Peter Rosin <address@hidden>
Date: Tue Jan 1 19:39:24 2013 +0100
maint: really do update to latest upstream gnulib
Commit 9a7071e668d044c1c47c855d2f0bc7cadb235071 "maint: update
copyright notices to include 2013." states that this was done, but
it actually was not.
gnulib/: Update to latest upstream.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 9 ++++-----
gnulib | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 87ed3d9..5f54346 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES =
# Using 'cd' in backquotes may print the directory name, use this instead:
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
+git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '--fallback'
'$(VERSION)' '.tarball-version'
rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed
's|-.*$$||g'`
@@ -126,11 +126,10 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
done; \
if $$rebuild; then \
rm -f '$@'; \
- if test -f '$(srcdir)/.serial'; then \
- serial=`cat '$(srcdir)/.serial'`; \
- else \
- serial=`$(git_commit_count)`; \
+ if test -d '$(srcdir)/.git' && git --version >/dev/null 2>&1; then \
+ $(git_commit_count) > '$(srcdir)/.serial'; \
fi; \
+ serial=`cat '$(srcdir)/.serial'`; \
if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
then echo " GEN " $@; \
else echo $(bootstrap_edit) "'$(ltversion_in)' > '$@'"; fi; \
diff --git a/gnulib b/gnulib
index c3d1ccf..9fc8109 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit c3d1ccfdb375b4cb1b912116c084a61422ef47e3
+Subproject commit 9fc81090f6c5590bd1b0e0fa5087577a2ee43a3e
hooks/post-receive
--
GNU Libtool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-347-ga9fac8d,
Peter Rosin <=