CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/18 02:54:22
Modified files:
. : ChangeLog
macros : firefox.m4
plugin : Makefile.am
plugin/klash : Makefile.am
Log message:
* macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
* plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
* plugin/klash/Makefile.am: define GNASHBINDIR based on
${bindir}
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4016&r2=1.4017
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4016
retrieving revision 1.4017
diff -u -b -r1.4016 -r1.4017
--- ChangeLog 17 Aug 2007 18:02:35 -0000 1.4016
+++ ChangeLog 18 Aug 2007 02:54:21 -0000 1.4017
@@ -1,3 +1,9 @@
+2007-08-18 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * macros/firefox.m4: drop --with-gnashexe and GNASHEXE macro
+ * plugin/Makefile.am: define GNASHBINDIR based on ${bindir}
+ * plugin/klash/Makefile.am: define GNASHBINDIR based on ${bindir}
+
2007-08-17 Sandro Santilli <[EMAIL PROTECTED]>
* server/sprite_instance.cpp (setVariables):
Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/firefox.m4 3 Aug 2007 03:01:16 -0000 1.25
+++ macros/firefox.m4 18 Aug 2007 02:54:21 -0000 1.26
@@ -41,19 +41,20 @@
[FIREFOX_PLUGINS=$withval]
)
- dnl Allow setting a path for the Gnash executable to be different from the
prefix. This
- dnl is mostly only used for cross compiling.
- AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory to
where the gnash executable is]),
- [gnashbindir=$withval]
- )
+dnl dnl Allow setting a path for the Gnash executable to be different from
the prefix. This
+dnl dnl is mostly only used for cross compiling.
+dnl AC_ARG_WITH(gnashexe, AC_HELP_STRING([--with-gnashexe=DIR], [Directory
to where the gnash executable is]),
+dnl [gnashbindir=$withval]
+dnl )
+dnl
+dnl dnl default to the prefix if no path is specified. As $prefix isn't
set at this time by
+dnl dnl configure, we set this to the variable itself so it gets resolved
at make time.
+dnl if test x"${gnashbindir}" = "x" ; then
+dnl GNASHEXE="\${prefix}/bin"
+dnl else
+dnl GNASHEXE=${gnashbindir}
+dnl fi
- dnl default to the prefix if no path is specified. As $prefix isn't set at
this time by
- dnl configure, we set this to the variable itself so it gets resolved at
make time.
- if test x"${gnashbindir}" = "x" ; then
- GNASHEXE="\${prefix}/bin"
- else
- GNASHEXE=${gnashbindir}
- fi
dnl Always install the plugin in the users home directory. We
dnl always use .mozilla instead of .firefox, as this directoryis
dnl used by all mozilla derived browsers.
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- plugin/Makefile.am 3 Aug 2007 04:27:39 -0000 1.63
+++ plugin/Makefile.am 18 Aug 2007 02:54:22 -0000 1.64
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.63 2007/08/03 04:27:39 strk Exp $
+# $Id: Makefile.am,v 1.64 2007/08/18 02:54:22 strk Exp $
AUTOMAKE_OPTIONS =
@@ -31,7 +31,7 @@
# XP_UNIX This needs to get defined for npapi.h on unix platforms.
# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
# api gets control.
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"$(GNASHEXE)\"
\
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DGNASHBINDIR=\"${bindir}\" \
-I.. \
-I$(srcdir) \
-I$(top_srcdir)/server \
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- plugin/klash/Makefile.am 3 Aug 2007 04:22:55 -0000 1.34
+++ plugin/klash/Makefile.am 18 Aug 2007 02:54:22 -0000 1.35
@@ -15,12 +15,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.34 2007/08/03 04:22:55 strk Exp $
+# $Id: Makefile.am,v 1.35 2007/08/18 02:54:22 strk Exp $
AUTOMAKE_OPTIONS =
if KPARTS
-AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
+AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
plugindir = $(libdir)/kde3
kde_servicesdir = $(prefix)/share/services
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
