sawfish r4473 - in trunk: . po sounds src

[chrisb svn gnome org]

Author: chrisb
Date: Sun Apr  5 14:44:57 2009
New Revision: 4473
URL: http://svn.gnome.org/viewvc/sawfish?rev=4473&view=rev

Log:
2009-04-05  Christopher Bratusek <zanghar freenet de>
        * sounds/Makefile.in
        * po/Makefile.in
        * src/Makefile.in: fix uninstall target

        * Makefile.in: uninstall all .desktop files

Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/po/Makefile.in
   trunk/sounds/Makefile.in
   trunk/src/Makefile.in

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Sun Apr  5 14:44:57 2009
@@ -73,7 +73,10 @@
 	  ( cd $$dir && $(MAKE) $@ ) || exit 1; \
 	done
 	rm -rf $(DESTDIR)$(sawfishdir)/$(version)
-	rm -f $(DESTDIR)/$(libdir)/pkgconfig/sawfish.pc
+	rm -f $(DESTDIR)$(libdir)/pkgconfig/sawfish.pc
+	rm -f $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
+	rm -f $(DESTDIR)$(datadir)/applications/sawfish.desktop
+	rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/sawfish-wm.desktop
 
 DOC :
 	repdoc DOC `find $(srcdir) \( -name '*.c' -o -name '*.jl' \) -print`

Modified: trunk/po/Makefile.in
==============================================================================
--- trunk/po/Makefile.in	(original)
+++ trunk/po/Makefile.in	Sun Apr  5 14:44:57 2009
@@ -76,7 +76,7 @@
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)
 
 uninstall :
-	rm -f $(DESTDIR)$(localedirdir)
+	rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/sawfish.mo
 
 clean :
 	rm -f core *~ *.mo

Modified: trunk/sounds/Makefile.in
==============================================================================
--- trunk/sounds/Makefile.in	(original)
+++ trunk/sounds/Makefile.in	Sun Apr  5 14:44:57 2009
@@ -40,7 +40,7 @@
 	$(SHELL) $< $(DESTDIR)$(soundsdir) $(DESTDIR)$(sitesoundsdir)
 
 uninstall :
-	rm -f $(DESTDIR)$(soundsdir)
+	rm -rf $(DESTDIR)$(soundsdir)
 
 clean :
 	rm -f *~ core

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Sun Apr  5 14:44:57 2009
@@ -75,14 +75,14 @@
 
 uninstall :
 	for p in sawfish; do \
-	  $(rep_LIBTOOL) --mode=uninstall rm $(DESTDIR)${bindir}/$$p; \
+	  $(rep_LIBTOOL) --mode=uninstall rm -f $(DESTDIR)${bindir}/$$p; \
 	done
 	rm -f $(DESTDIR)$(bindir)/sawfish-client
-	$(rep_DL_UNINSTALL) $(DESTDIR)${sawfishexecdir}/gtk-style
+	$(rep_DL_UNINSTALL) -f $(DESTDIR)${sawfishexecdir}/gtk-style
 	for dl in $(DL_DSTS); do \
-	  $(rep_LIBTOOL) --mode=uninstall rm $(DESTDIR)${sawfishexecdir}/$$dl; \
+	  $(rep_LIBTOOL) --mode=uninstall rm -f $(DESTDIR)${sawfishexecdir}/$$dl; \
 	done
-	$(rep_DL_UNINSTALL) $(DESTDIR)$(repexecdir)/sawfish/client.la
+	$(rep_DL_UNINSTALL) -f $(DESTDIR)$(repexecdir)/sawfish/client.la
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \