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

[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  a3ca6b7cf25dc9d7db83d3e77fb1f733eb7d5ff5 (commit)
       via  17939244d678bbc6dfdfa1757c2e99f879cdd3e5 (commit)
      from  2864a9e2da27279b8764f67a20ffc7f718391426 (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=a3ca6b7cf25dc9d7db83d3e77fb1f733eb7d5ff5


commit a3ca6b7cf25dc9d7db83d3e77fb1f733eb7d5ff5
Merge: 1793924 2864a9e
Author: Rob Savoye <address@hidden>
Date:   Sat Dec 4 15:36:10 2010 -0700

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


http://git.savannah.gnu.org/cgit//commit/?id=17939244d678bbc6dfdfa1757c2e99f879cdd3e5


commit 17939244d678bbc6dfdfa1757c2e99f879cdd3e5
Author: Rob Savoye <address@hidden>
Date:   Sat Dec 4 15:35:54 2010 -0700

    use (srcdir) for gnash.in

diff --git a/gui/Makefile.am b/gui/Makefile.am
index 1d056e5..80fffd4 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -188,7 +188,7 @@ bin_SCRIPTS = gnash
 bin_PROGRAMS = 
 
 gnash: gnash.in
-       cp gnash.in $@
+       cp $(srcdir)/gnash.in $@
        chmod +x $@
 
 # Always include the device files in the source tarball

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

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


hooks/post-receive
-- 
Gnash