[Gnash-commit] gnash ChangeLog plugin/klash/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/29 13:54:48

Modified files:
        .              : ChangeLog 
        plugin/klash   : Makefile.am 

Log message:
        use kde-config to find install system dirs for kde plugin. (TODO: allow
        overriding the install paths..)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5270&r2=1.5271
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5270
retrieving revision 1.5271
diff -u -b -r1.5270 -r1.5271
--- ChangeLog   29 Dec 2007 13:15:12 -0000      1.5270
+++ ChangeLog   29 Dec 2007 13:54:47 -0000      1.5271
@@ -1,5 +1,7 @@
 2007-12-29 Sandro Santilli <address@hidden>
 
+       * plugin/klash/Makefile.am: use kde-config to find install
+         system dirs for kde plugin. 
        * testsuite/MovieTester.cpp: allow loading initial movie
          (local sandboxes..)
        * utilities/processor.cpp: add main movie base dir

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- plugin/klash/Makefile.am    18 Aug 2007 02:54:22 -0000      1.35
+++ plugin/klash/Makefile.am    29 Dec 2007 13:54:48 -0000      1.36
@@ -15,15 +15,15 @@
 # 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.35 2007/08/18 02:54:22 strk Exp $
+# $Id: Makefile.am,v 1.36 2007/12/29 13:54:48 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
 if KPARTS
 AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"${bindir}\"
 
-plugindir   = $(libdir)/kde3
-kde_servicesdir = $(prefix)/share/services
+plugindir   = `$(KDE_CONFIG) --install module --expandvars` # $(libdir)/kde3
+kde_servicesdir = `$(KDE_CONFIG) --install services --expandvars` # 
$(prefix)/share/services
 rcdir       = $(prefix)/share/apps/klash
 appsdatadir = $(prefix)/share/apps/klash
 configdir = $(prefix)/share/config
@@ -57,10 +57,13 @@
          ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \
        fi
 
+install-data: $(dist_kde_services_DATA)
+       $(INSTALL) $(dist_kde_services_DATA) $(kde_servicesdir)
+
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
 #      cp .libs/libklashpart.so $(DESTDIR)$(plugindir)/libklashpart.so
-       $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
+       $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
 #      $(RM) libklashpart.*a $(DESTDIR)$(plugindir)/libklashpart.so.0
 
 uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)