1.1 --- a/Makefile.in	Wed May 30 11:24:33 2012 +0200
     1.2 +++ b/Makefile.in	Wed May 30 11:38:03 2012 +0200
     1.3 @@ -691,16 +691,13 @@
     1.4  	uninstall uninstall-am uninstall-local
     1.5  
     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 +uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-dirs
    1.12  
    1.13  conf_dir:
    1.14  	install -d $(DESTDIR)@with_confdir@
    1.15  
    1.16 -rm-conf_dir:
    1.17 -	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
    1.18 -
    1.19  tpl_dir:
    1.20  	install -d $(DESTDIR)@datadir@/masqmail/tpl
    1.21  	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
    1.22 @@ -722,18 +719,10 @@
    1.23  	)
    1.24  	rmdir $(DESTDIR)@docdir@
    1.25  
    1.26 -log_dir:
    1.27 -	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
    1.28 -
    1.29 -rm-log_dir:
    1.30 -	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
    1.31 -
    1.32 -spool_dir:
    1.33 -	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@
    1.34 -
    1.35 -rm-spool_dir:
    1.36 -	: # removal fails if the dirs are non-empty
    1.37 -	: # this prevents losing spooled files
    1.38 +rm-dirs:
    1.39 +	: # removes only if empty
    1.40 +	rmdir $(DESTDIR)@with_confdir@
    1.41 +	rmdir $(DESTDIR)@with_logdir@
    1.42  	rmdir $(DESTDIR)@with_spooldir@
    1.43  
    1.44  rmail: