[Gnash-commit] [SCM] Gnash branch, master, updated. 085c5014c866216ec809f01a5f61cdc79b77d645

[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  085c5014c866216ec809f01a5f61cdc79b77d645 (commit)
      from  9e9c9aca293d218428dd8f3f1a096b5ce900e670 (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=085c5014c866216ec809f01a5f61cdc79b77d645


commit 085c5014c866216ec809f01a5f61cdc79b77d645
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 1 10:25:58 2010 -0600

    use NOW if revno isn't set. For some reason, git describe fails on some 
machines.

diff --git a/Makefile.am b/Makefile.am
index aad6c55..27bddea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,7 @@ revno.h: Makefile.in
            revno=`(cd $(srcdir) && bzr revno)`; \
            nick=`basename $(top_srcdir)`; \
          else \
-           revno="${NOW}"; \
+           revno="$(NOW)"; \
          fi; \
        else \
          if test -d $(top_srcdir)/.git; then \
@@ -150,9 +150,12 @@ revno.h: Makefile.in
               nick="`(cd $(top_srcdir) && git branch | grep "\*" | cut -d ' ' 
-f 2)`"; \
            fi; \
           else \
-            revno="${NOW}"; \
+            revno="$(NOW)"; \
             nick="none"; \
          fi; \
+         if test x$$revno = x; then \
+           revno="$(NOW)"; \
+         fi; \
        fi; \
        echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
        echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h;

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

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


hooks/post-receive
-- 
Gnash