# HG changeset patch
# User meillo@marmaro.de
# Date 1278538985 -7200
# Node ID e68d8752735a1b12a9451321c857c54fbad9e8ae
# Parent  89467037cb362eca6e6788635429700d6609f47b
remove all installed dirs on `make uninstall'
but no generated data
remove log_dir, conf_dir, spool_dir if empty
remove run_dir in any case

diff -r 89467037cb36 -r e68d8752735a Makefile.am
--- a/Makefile.am	Wed Jul 07 23:37:49 2010 +0200
+++ b/Makefile.am	Wed Jul 07 23:43:05 2010 +0200
@@ -4,7 +4,7 @@
 
 install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
 
-uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir
+uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
 
 
 conf_dir: $(DESTDIR)@with_confdir@
@@ -12,6 +12,9 @@
 $(DESTDIR)@with_confdir@:
 	install -d $(DESTDIR)@with_confdir@
 
+rm-conf_dir:
+	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
+
 
 tpl_dir: $(DESTDIR)@datadir@/tpl
 
@@ -35,6 +38,8 @@
 run_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
 
+rm-run_dir:
+	rm -rf $(DESTDIR)/var/run/masqmail
 
 
 log_dir: $(DESTDIR)@with_logdir@
@@ -44,6 +49,8 @@
 		install -d `dirname $(DESTDIR)@with_logdir@`
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
 
+rm-log_dir:
+	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
 
 
 spool_dir: $(DESTDIR)@with_spooldir@
@@ -56,6 +63,13 @@
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/input
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/popuidl
 
+rm-spool_dir:
+	: # removal fails if the dirs are non-empty
+	: # this prevents losing spooled files
+	rmdir $(DESTDIR)@with_spooldir@/lock
+	rmdir $(DESTDIR)@with_spooldir@/input
+	rmdir $(DESTDIR)@with_spooldir@/popuidl
+	rmdir $(DESTDIR)@with_spooldir@
 
 rmail:
 	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
diff -r 89467037cb36 -r e68d8752735a Makefile.in
--- a/Makefile.in	Wed Jul 07 23:37:49 2010 +0200
+++ b/Makefile.in	Wed Jul 07 23:43:05 2010 +0200
@@ -693,13 +693,16 @@
 
 install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
 
-uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir
+uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
 
 conf_dir: $(DESTDIR)@with_confdir@
 
 $(DESTDIR)@with_confdir@:
 	install -d $(DESTDIR)@with_confdir@
 
+rm-conf_dir:
+	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
+
 tpl_dir: $(DESTDIR)@datadir@/tpl
 
 $(DESTDIR)@datadir@/tpl: conf_dir
@@ -719,6 +722,9 @@
 run_dir:
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
 
+rm-run_dir:
+	rm -rf $(DESTDIR)/var/run/masqmail
+
 log_dir: $(DESTDIR)@with_logdir@
 
 $(DESTDIR)@with_logdir@:
@@ -726,6 +732,9 @@
 		install -d `dirname $(DESTDIR)@with_logdir@`
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
 
+rm-log_dir:
+	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
+
 spool_dir: $(DESTDIR)@with_spooldir@
 
 $(DESTDIR)@with_spooldir@:
@@ -736,6 +745,14 @@
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/input
 	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/popuidl
 
+rm-spool_dir:
+	: # removal fails if the dirs are non-empty
+	: # this prevents losing spooled files
+	rmdir $(DESTDIR)@with_spooldir@/lock
+	rmdir $(DESTDIR)@with_spooldir@/input
+	rmdir $(DESTDIR)@with_spooldir@/popuidl
+	rmdir $(DESTDIR)@with_spooldir@
+
 rmail:
 	[ -d "$(DESTDIR)@prefix@/bin" ] || mkdir -p "$(DESTDIR)@prefix@/bin"
 	sed '/^SENDMAIL/s,/usr/sbin/sendmail,$(DESTDIR)@prefix@/sbin/masqmail,'\