1.1 --- a/Makefile.am	Wed May 30 11:24:33 2012 +0200
     1.2 +++ b/Makefile.am	Wed May 30 11:38:03 2012 +0200
     1.3 @@ -2,18 +2,13 @@
     1.4  
     1.5  SUBDIRS = src man
     1.6  
     1.7 -install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir doc_dir rmail
     1.8 +install-data-local: uid_bit tpl_dir doc_dir rmail conf_dir
     1.9  
    1.10 -uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-spool_dir rm-log_dir
    1.11 -
    1.12 +uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-dirs
    1.13  
    1.14  conf_dir:
    1.15  	install -d $(DESTDIR)@with_confdir@
    1.16  
    1.17 -rm-conf_dir:
    1.18 -	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
    1.19 -
    1.20 -
    1.21  tpl_dir:
    1.22  	install -d $(DESTDIR)@datadir@/masqmail/tpl
    1.23  	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
    1.24 @@ -22,7 +17,6 @@
    1.25  rm-tpl_dir:
    1.26  	rm -rf $(DESTDIR)@datadir@/masqmail/
    1.27  
    1.28 -
    1.29  doc_dir:
    1.30  	install -d $(DESTDIR)@docdir@
    1.31  	cp -r docs $(DESTDIR)@docdir@
    1.32 @@ -36,20 +30,10 @@
    1.33  	)
    1.34  	rmdir $(DESTDIR)@docdir@
    1.35  
    1.36 -
    1.37 -log_dir:
    1.38 -	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
    1.39 -
    1.40 -rm-log_dir:
    1.41 -	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
    1.42 -
    1.43 -
    1.44 -spool_dir:
    1.45 -	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@
    1.46 -
    1.47 -rm-spool_dir:
    1.48 -	: # removal fails if the dirs are non-empty
    1.49 -	: # this prevents losing spooled files
    1.50 +rm-dirs:
    1.51 +	: # removes only if empty
    1.52 +	rmdir $(DESTDIR)@with_confdir@
    1.53 +	rmdir $(DESTDIR)@with_logdir@
    1.54  	rmdir $(DESTDIR)@with_spooldir@
    1.55  
    1.56  rmail: