3 files changed, 14 insertions, 15 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f46fa6c1..c8054908 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = README.menu menu.in
 all-local: menu
 
 distclean-local:
-	rm -f *\~ .\#*
+	$(RM) *\~ .\#*
 
 menu: menu.in
 	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," @srcdir@/menu.in > menu
@@ -17,5 +17,4 @@ install-data-local: menu
 	$(INSTALL_DATA) menu $(DESTDIR)$(pkgdatadir)
 
 uninstall-am:
-	rm -f $(DESTDIR)$(pkgdatadir)/menu
-
+	$(RM) $(DESTDIR)$(pkgdatadir)/menu
diff --git a/data/buttons/Makefile.am b/data/buttons/Makefile.am
index 9ee8ddea..1984748d 100644
--- a/data/buttons/Makefile.am
+++ b/data/buttons/Makefile.am
@@ -1,13 +1,13 @@
-buttonsdir = $(pkgdatadir)/buttons
+#buttonsdir = $(pkgdatadir)/buttons
 MAINTAINERCLEANFILES = Makefile.in
-buttons_DATA =
+#buttons_DATA =
                #fieron-bullet.xbm fieron-bulletl.xbm fieron-close.xbm \
                #fieron-icon.xbm fieron-max.xbm fieron-stick.xbm \
                #max.xbm stick.xbm icon.xbm close.xbm
 
-EXTRA_DIST = $(buttons_DATA)
+#EXTRA_DIST = $(buttons_DATA)
 
 distclean-local:
-	rm -f *\~ .\#*
-uninstall-am:
-	rmdir $(buttonsdir)
+	$(RM) *\~ .\#*
+#uninstall-am:
+#	rmdir -p $(DESTDIR)$(buttonsdir) || true
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
index 7b5b38e0..6a4853bf 100644
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@@ -1,13 +1,13 @@
-styledir = $(pkgdatadir)/styles
+#styledir = $(pkgdatadir)/styles
 MAINTAINERCLEANFILES = Makefile.in
-style_DATA =
+#style_DATA =
 #artwiz bbs bluebox cthulhain deep fieron fieron2 flux frobozz \
 #frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \
 #purplehaaze shade steelblue steelblue2 the_orange trisb twice \
 #warp-xp
-EXTRA_DIST = $(style_DATA)
+#EXTRA_DIST = $(style_DATA)
 
 distclean-local:
-	rm -f *\~ .\#*
-uninstall-am:
-	rmdir $(styledir)
+	$(RM) *\~ .\#*
+#uninstall-am:
+#	rmdir -p $(DESTDIR)$(styledir) || true