[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/i...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/04 13:35:12

Modified files:
        .              : ChangeLog configure.ac 
        doc/C/usermanual/installation: custompath_configuration.xml 
        plugin/klash   : Makefile.am 

Log message:
        Add --with-kde-pluginprefix configure switch, thanks to Fredrik 
Johansson. 
        See bug #21907.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5295&r2=1.5296
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.467&r2=1.468
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/custompath_configuration.xml?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5295
retrieving revision 1.5296
diff -u -b -r1.5295 -r1.5296
--- ChangeLog   4 Jan 2008 13:10:44 -0000       1.5295
+++ ChangeLog   4 Jan 2008 13:35:11 -0000       1.5296
@@ -1,5 +1,16 @@
 2008-01-04 Sandro Santilli <address@hidden>
 
+       *  doc/C/usermanual/installation/custompath_configuration.xml:
+         Document --with-kde-pluginprefix configure switch.
+
+2008-01-04 Fredrik Johansson <address@hidden>
+
+       * configure.ac, plugin/klash/Makefile.am: 
+         add --with-kde-pluginprefix configure switch.
+         See bug #21907.
+
+2008-01-04 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (beginGradientFill): 
          Improvements in non-boxed matrixType use, comments
          about future improvements.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -b -r1.467 -r1.468
--- configure.ac        2 Jan 2008 12:04:43 -0000       1.467
+++ configure.ac        4 Jan 2008 13:35:11 -0000       1.468
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.467 2008/01/02 12:04:43 strk Exp $
+dnl $Id: configure.ac,v 1.468 2008/01/04 13:35:11 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1371,24 +1371,36 @@
 fi
 
 if test x$kparts = xyes; then
+  AC_ARG_WITH(kde-pluginprefix,
+    AC_HELP_STRING([--with-kde-pluginprefix=DIR],
+      [Prefix for KDE plugin, like /usr]),
+    [KDE_PLUGINPREFIX=${withval}]
+  )
 
+  if test $KDE_PLUGINPREFIX; then
+    KDE_PLUGINDIR=$KDE_PLUGINPREFIX'/lib/kde3'
+    KDE_SERVICESDIR=$KDE_PLUGINPREFIX'/share/services'
+    KDE_CONFIGDIR=$KDE_PLUGINPREFIX'/share/config'
+    KDE_APPSDATADIR=$KDE_PLUGINPREFIX'/share/apps/klash'
+  else
+    if test x${KDE_CONFIG} != x; then
+      KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
+      KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
+      KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
+      KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`'/klash'
+    else
   KDE_PLUGINDIR='$(libdir)/kde3'
   KDE_SERVICESDIR='$(prefix)/share/services'
   KDE_CONFIGDIR='$(prefix)/share/config'
-  KDE_APPSDATADIR='$(prefix)/share/apps'
+      KDE_APPSDATADIR='$(prefix)/share/apps/klash'
+    fi
+  fi
 
   AC_SUBST(KDE_PLUGINDIR)
   AC_SUBST(KDE_SERVICESDIR)
   AC_SUBST(KDE_CONFIGDIR)
   AC_SUBST(KDE_APPSDATADIR)
 
-  if test x${KDE_CONFIG} != x; then
-     KDE_PLUGINDIR=`${KDE_CONFIG} --install module --expandvars`
-     KDE_SERVICESDIR=`${KDE_CONFIG} --install services --expandvars`
-     KDE_CONFIGDIR=`${KDE_CONFIG} --install config --expandvars`
-     KDE_APPSDATADIR=`${KDE_CONFIG} --install data --expandvars`
-  fi
-
   AC_ARG_WITH(kde-plugindir,
     AC_HELP_STRING([--with-kde-plugindir=DIR],
       [Directory to install KDE plugin in]),
@@ -1412,7 +1424,6 @@
       [Directory to install KDE data in]),
     [KDE_APPSDATADIR=${withval}]
   )
-
 fi
 
 AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])

Index: doc/C/usermanual/installation/custompath_configuration.xml
===================================================================
RCS file: 
/sources/gnash/gnash/doc/C/usermanual/installation/custompath_configuration.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/C/usermanual/installation/custompath_configuration.xml  2 Jan 2008 
12:04:43 -0000       1.7
+++ doc/C/usermanual/installation/custompath_configuration.xml  4 Jan 2008 
13:35:12 -0000       1.8
@@ -149,11 +149,22 @@
       </entry>
   </row><row>
   <entry>
+    <option>--with-kde-pluginprefix</option>
+    </entry>
+      <entry>
+        This option sets the default install dir for all KPARTS (kde) files.
+       The plugin will be installed in PREFIX/lib/kde3, use 
-with-kde-plugindir to override.
+       The service file in PREFIX/share/services, use --with-kde-servicesdir 
to override.
+       The config file in PREFIX/share/config, use --with-kde-configdir to 
override.
+       The appdata file in PREFIX/share/apps/klash, use --with-kde-appsdatadir 
to override.
+      </entry>
+  </row><row>
+  <entry>
     <option>--with-kde-plugindir</option>
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) plugin in.
-        By default it is what's returned by kde-config --install module 
--expandvars,
+        By default it is what's set by --with-kde-pluginprefix or what's 
returned by kde-config --install module --expandvars,
         or $(prefix)/share/services if kde-config is not found.
       </entry>
   </row><row>
@@ -162,7 +173,7 @@
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) service in.
-        By default it is what's returned by kde-config --install services 
--expandvars,
+        By default it is what's set by --with-kde-pluginprefix or what's 
returned by kde-config --install services --expandvars,
         or $(libdir)/kde3 if kde-config is not found.
       </entry>
   </row><row>
@@ -171,7 +182,7 @@
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) config files in.
-        By default it is what's returned by kde-config --install config 
--expandvars,
+        By default it is what's set by --with-kde-pluginprefix or what's 
returned by kde-config --install config --expandvars,
         or $(prefix)/share/config if kde-config is not found.
       </entry>
   </row><row>
@@ -180,7 +191,7 @@
     </entry>
       <entry>
         This is the directory to install the KPARTS (kde) application data 
files in.
-        By default it is what's returned by kde-config --install data 
--expandvars,
+        By default it is what's set by --with-kde-pluginprefix or what's 
returned by kde-config --install data --expandvars,
         or $(prefix)/share/apps if kde-config is not found.
       </entry>
   </row><row>

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- plugin/klash/Makefile.am    2 Jan 2008 12:04:43 -0000       1.38
+++ plugin/klash/Makefile.am    4 Jan 2008 13:35:12 -0000       1.39
@@ -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.38 2008/01/02 12:04:43 strk Exp $
+# $Id: Makefile.am,v 1.39 2008/01/04 13:35:12 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -24,9 +24,9 @@
 
 plugindir   = $(KDE_PLUGINDIR)
 kde_servicesdir = $(KDE_SERVICESDIR)
-kde_rcdir       = $(KDE_APPSDATADIR)/klash
+kde_rcdir       = $(KDE_APPSDATADIR)
 #$(prefix)/share/apps/klash
-kde_appsdatadir = $(KDE_APPSDATADIR)/klash
+kde_appsdatadir = $(KDE_APPSDATADIR)
 #$(prefix)/share/apps/klash
 kde_configdir   = $(KDE_CONFIGDIR)
 #$(prefix)/share/config