CVSROOT: /sources/gnash Module name: gnash Changes by: Sandro Santilli <strk> 08/01/05 01:04:11
Modified files: . : ChangeLog plugin/klash : Makefile.am Log message: actually drop all install rules, automake does a perfect job at it. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5299&r2=1.5300 http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41 Patches: Index: ChangeLog =================================================================== RCS file: /sources/gnash/gnash/ChangeLog,v retrieving revision 1.5299 retrieving revision 1.5300 diff -u -b -r1.5299 -r1.5300 --- ChangeLog 5 Jan 2008 00:37:42 -0000 1.5299 +++ ChangeLog 5 Jan 2008 01:04:10 -0000 1.5300 @@ -1,5 +1,10 @@ 2008-01-04 Sandro Santilli <[EMAIL PROTECTED]> + * plugin/klash/Makefile.am: actually drop all install rules, + automake does a perfect job at it. + +2008-01-04 Sandro Santilli <[EMAIL PROTECTED]> + * 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. Index: plugin/klash/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -b -r1.40 -r1.41 --- plugin/klash/Makefile.am 5 Jan 2008 00:37:42 -0000 1.40 +++ plugin/klash/Makefile.am 5 Jan 2008 01:04:11 -0000 1.41 @@ -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.40 2008/01/05 00:37:42 strk Exp $ +# $Id: Makefile.am,v 1.41 2008/01/05 01:04:11 strk Exp $ AUTOMAKE_OPTIONS = @@ -60,20 +60,18 @@ ln -s $(srcdir)/klash_part.moc.in klash_part.moc; \ fi -install-data: $(dist_kde_services_DATA) - 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) -# 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 - -uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so - $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la - $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a +# install-data: $(dist_kde_services_DATA) +# 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) +# $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir) +# +# uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) +# $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so +# $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la +# $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a endif _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit