1.1 --- a/Makefile.in	Thu Jul 08 00:08:18 2010 +0200
     1.2 +++ b/Makefile.in	Thu Jul 08 00:26:55 2010 +0200
     1.3 @@ -695,29 +695,32 @@
     1.4  
     1.5  uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
     1.6  
     1.7 -conf_dir: $(DESTDIR)@with_confdir@
     1.8 -
     1.9 -$(DESTDIR)@with_confdir@:
    1.10 +conf_dir:
    1.11  	install -d $(DESTDIR)@with_confdir@
    1.12  
    1.13  rm-conf_dir:
    1.14  	rmdir $(DESTDIR)@with_confdir@  # removes only if empty
    1.15  
    1.16 -tpl_dir: $(DESTDIR)@datadir@/tpl
    1.17 -
    1.18 -$(DESTDIR)@datadir@/tpl: conf_dir
    1.19 +tpl_dir:
    1.20  	install -d $(DESTDIR)@datadir@/masqmail/tpl
    1.21  	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
    1.22  	chmod 644 $(DESTDIR)@datadir@/masqmail/tpl/*
    1.23  
    1.24 +rm-tpl_dir:
    1.25 +	rm -rf $(DESTDIR)@datadir@/masqmail/
    1.26 +
    1.27  doc_dir:
    1.28  	install -d $(DESTDIR)@docdir@
    1.29  	cp -r docs $(DESTDIR)@docdir@
    1.30  	cp -r examples $(DESTDIR)@docdir@
    1.31  	cp ChangeLog NEWS AUTHORS COPYING README TODO $(DESTDIR)@docdir@
    1.32  
    1.33 -uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
    1.34 -	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
    1.35 +rm-doc_dir:
    1.36 +	cd $(DESTDIR)@docdir@ && ( \
    1.37 +	    rm -rf docs examples ; \
    1.38 +	    rm -f ChangeLog NEWS AUTHORS COPYING README TODO ; \
    1.39 +	)
    1.40 +	rmdir $(DESTDIR)@docdir@
    1.41  
    1.42  run_dir:
    1.43  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
    1.44 @@ -725,21 +728,13 @@
    1.45  rm-run_dir:
    1.46  	rm -rf $(DESTDIR)/var/run/masqmail
    1.47  
    1.48 -log_dir: $(DESTDIR)@with_logdir@
    1.49 -
    1.50 -$(DESTDIR)@with_logdir@:
    1.51 -	[ -d `dirname $(DESTDIR)@with_logdir@` ] || \
    1.52 -		install -d `dirname $(DESTDIR)@with_logdir@`
    1.53 +log_dir:
    1.54  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
    1.55  
    1.56  rm-log_dir:
    1.57  	rmdir $(DESTDIR)@with_logdir@  # removes only if empty
    1.58  
    1.59 -spool_dir: $(DESTDIR)@with_spooldir@
    1.60 -
    1.61 -$(DESTDIR)@with_spooldir@:
    1.62 -	[ -d `dirname $(DESTDIR)@with_spooldir@` ] || \
    1.63 -		install -d `dirname $(DESTDIR)@with_spooldir@`
    1.64 +spool_dir:
    1.65  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@
    1.66  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/lock
    1.67  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_spooldir@/input
    1.68 @@ -762,15 +757,8 @@
    1.69  rm-rmail:
    1.70  	rm -f $(DESTDIR)@prefix@/bin/rmail
    1.71  
    1.72 -rm-doc_dir:
    1.73 -	cd $(DESTDIR)@docdir@ && ( \
    1.74 -	    rm -rf docs examples ; \
    1.75 -	    rm -f ChangeLog NEWS AUTHORS COPYING README TODO ; \
    1.76 -	)
    1.77 -	rmdir $(DESTDIR)@docdir@
    1.78 -
    1.79 -rm-tpl_dir:
    1.80 -	rm -rf $(DESTDIR)@datadir@/masqmail/
    1.81 +uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
    1.82 +	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
    1.83  
    1.84  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    1.85  # Otherwise a system limit (for SysV at least) may be exceeded.