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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/05 00:37:43

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

Log message:
                * plugin/klash/Makefile.am: don't quote installation paths, or
                  ~ would not be interpreted by mkdir_p as $HOME. Use DESTDIR
                  for the kde service too, and create the dir if non existing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5298&r2=1.5299
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5298
retrieving revision 1.5299
diff -u -b -r1.5298 -r1.5299
--- ChangeLog   5 Jan 2008 00:08:46 -0000       1.5298
+++ ChangeLog   5 Jan 2008 00:37:42 -0000       1.5299
@@ -1,5 +1,11 @@
 2008-01-04 Sandro Santilli <address@hidden>
 
+       * plugin/klash/Makefile.am: don't quote installation paths, or
+         ~ would not be interpreted by mkdir_p as $HOME. Use DESTDIR
+         for the kde service too, and create the dir if non existing.
+
+2008-01-04 Sandro Santilli <address@hidden>
+
        * server/URLAccessManager.cpp (local_check): don't use base url
          (-U) to tell apart local movies from remote ones, as base url
          is web-author-forgeable ('base' attribute).

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- plugin/klash/Makefile.am    4 Jan 2008 13:35:12 -0000       1.39
+++ plugin/klash/Makefile.am    5 Jan 2008 00:37:42 -0000       1.40
@@ -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.39 2008/01/04 13:35:12 strk Exp $
+# $Id: Makefile.am,v 1.40 2008/01/05 00:37:42 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -61,10 +61,11 @@
        fi
 
 install-data: $(dist_kde_services_DATA)
-       $(INSTALL) $(dist_kde_services_DATA) $(kde_servicesdir)
+       test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) 
$(DESTDIR)$(kde_servicesdir)
+       $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
 
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-       test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
+       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)
 #      $(RM) libklashpart.*a $(DESTDIR)$(plugindir)/libklashpart.so.0