[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-370-g0a95252

[Gabriele Giacone]

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  0a952522bb73e351a0967aced567dcb319285f5c (commit)
       via  bdbed7e6894d484a1cd0a17c338a3ac71923e980 (commit)
      from  a442a62560ad566e5916194f37be1f772b9faf76 (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=0a952522bb73e351a0967aced567dcb319285f5c


commit 0a952522bb73e351a0967aced567dcb319285f5c
Author: Gabriele Giacone <address@hidden>
Date:   Sat Jun 25 01:32:33 2011 +0200

    Add multiarch paths.

diff --git a/configure.ac b/configure.ac
index ee76011..700abe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,8 +504,10 @@ if test x$cross_compiling = xyes; then
   npapi=no
 else
   AC_MSG_NOTICE([Configuring Gnash for native compilation])
+  export DEB_HOST_MULTIARCH="`eval dpkg-architecture -qDEB_HOST_MULTIARCH`"
   export incllist="`eval cat ${srcdir}/macros/incllist`"
-  export libslist="`eval cat ${srcdir}/macros/libslist`"
+  libslist="`cat ${srcdir}/macros/libslist`"
+  export libslist+=" /lib/${DEB_HOST_MULTIARCH} /usr/lib/${DEB_HOST_MULTIARCH}"
   export pathlist=$PATH
 fi
 
diff --git a/macros/libslist b/macros/libslist
index df1ad5d..8148712 100644
--- a/macros/libslist
+++ b/macros/libslist
@@ -1 +1 @@
-${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 
/usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib 
/opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib 
/usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 
/boot/common/lib /boot/system/lib/gcc4 /boot/system/lib /lib/x86_64-linux-gnu 
/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 
/usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib 
/opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib 
/usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 
/boot/common/lib /boot/system/lib/gcc4 /boot/system/lib .. ../..

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


commit bdbed7e6894d484a1cd0a17c338a3ac71923e980
Author: Gabriele Giacone <address@hidden>
Date:   Sat Jun 25 01:32:28 2011 +0200

    Fix cygnal manpage.

diff --git a/doc/C/cygnal.man-xml b/doc/C/cygnal.man-xml
index 3917ff6..7aefd71 100644
--- a/doc/C/cygnal.man-xml
+++ b/doc/C/cygnal.man-xml
@@ -40,7 +40,8 @@ cygnal (options)...
 
 <variablelist>
   <varlistentry>
-    <term>(-h) --help</term>
+    <term>-h</term>
+    <term>--help</term>
     <listitem>
       <para>
        Print usage info.
@@ -58,7 +59,8 @@ cygnal (options)...
   </varlistentry>
   
   <varlistentry>
-    <term>(-v) --verbose</term>
+    <term>-v</term>
+    <term>--verbose</term>
     <listitem>
       <para>
        Verbose output.
@@ -67,7 +69,8 @@ cygnal (options)...
   </varlistentry>
   
   <varlistentry>
-    <term>(-p) --port-offset</term>
+    <term>-p</term>
+    <term>--port-offset</term>
     <listitem>
       <para>
        Port offset. This number gets added to the default

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

Summary of changes:
 configure.ac         |    4 +++-
 doc/C/cygnal.man-xml |    9 ++++++---
 macros/libslist      |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash