[Gnash-commit] [SCM] Gnash branch, master, updated. e58ee26e4784984ce34382b89f85f3862867d9b3

[Rob Savoye]

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 "Gnash".

The branch, master has been updated
       via  e58ee26e4784984ce34382b89f85f3862867d9b3 (commit)
       via  6d1857cc6172e141a74a1a61587dfd21063f2f6d (commit)
      from  c923fea8221a60656066e4198206ead62521b4b9 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=e58ee26e4784984ce34382b89f85f3862867d9b3


commit e58ee26e4784984ce34382b89f85f3862867d9b3
Merge: 6d1857c c923fea
Author: Rob Savoye <address@hidden>
Date:   Fri Dec 17 17:13:37 2010 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=6d1857cc6172e141a74a1a61587dfd21063f2f6d


commit 6d1857cc6172e141a74a1a61587dfd21063f2f6d
Author: Gabriele Giacone <address@hidden>
Date:   Fri Dec 17 23:24:48 2010 +0100

    Fix revno.h generation

diff --git a/Makefile.am b/Makefile.am
index 929df67..36844b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,17 +134,19 @@ revno.h:
        @if test \! -e .lastmod; then \
          touch -t 197001010000 .lastmod; \
        fi; \
-       if test $(top_srcdir)/.git/index -nt .lastmod; then \
-         if test -d $(top_srcdir)/.git -a x"${GIT}" != x; then \
+       if test -d $(top_srcdir)/.git -a x"${GIT}" != x; then \
+         if test $(top_srcdir)/.git/index -nt .lastmod; then \
             echo "Getting build info for revno.h"; \
             revno="`cd $(top_srcdir) ; $(GIT) rev-list HEAD | wc -l`"; \
             comm_id="`cd $(top_srcdir) ; $(GIT) rev-parse --short HEAD`"; \
             nick="`cd $(top_srcdir) ; $(GIT) branch | grep '^\*' | cut -d ' ' 
-f 2`"; \
-          else \
-            revno="$(NOW)"; \
-            comm_id="none"; \
-            nick="master"; \
-          fi; \
+         fi \
+        else \
+          revno="$(NOW)"; \
+          comm_id="none"; \
+          nick="master"; \
+        fi; \
+       if test \! -z "$${revno}"; then \
           echo "Generating revno.h ($${nick} $${revno} $${comm_id})"; \
           echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
           echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h; \

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash