1.1 --- a/Makefile.am	Sat May 29 22:57:17 2010 +0200
     1.2 +++ b/Makefile.am	Sat May 29 23:43:32 2010 +0200
     1.3 @@ -1,46 +1,51 @@
     1.4 -EXTRA_DIST = \
     1.5 -examples/* docs/* man/* tpl/* \
     1.6 -INSTALL.agenda INSTALL.ipaq agenda-config.site
     1.7 +EXTRA_DIST = examples/* docs/* man/* tpl/*
     1.8  
     1.9  SUBDIRS = src man
    1.10  
    1.11  install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir
    1.12  
    1.13 +
    1.14  conf_dir: $(DESTDIR)@with_confdir@
    1.15  
    1.16  $(DESTDIR)@with_confdir@:
    1.17  	install -d $(DESTDIR)@with_confdir@
    1.18  
    1.19 +
    1.20  tpl_dir: $(DESTDIR)@datadir@/tpl
    1.21  
    1.22  $(DESTDIR)@datadir@/tpl: conf_dir
    1.23  	install -d $(DESTDIR)@datadir@/masqmail/tpl
    1.24 -	install -m 644 tpl/failmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl
    1.25 -	install -m 644 tpl/failmsg.tpl.* $(DESTDIR)@datadir@/masqmail/tpl
    1.26 -	install -m 644 tpl/warnmsg.tpl $(DESTDIR)@datadir@/masqmail/tpl
    1.27 -	install -m 644 tpl/warnmsg.tpl.* $(DESTDIR)@datadir@/masqmail/tpl
    1.28 +	cp tpl/* $(DESTDIR)@datadir@/masqmail/tpl
    1.29 +	chmod 644 $(DESTDIR)@datadir@/masqmail/tpl/*
    1.30  
    1.31 -doc_dir: conf_dir
    1.32 +
    1.33 +doc_dir:
    1.34  	install -d $(DESTDIR)@docdir@
    1.35  	cp -r docs $(DESTDIR)@docdir@
    1.36  	cp -r examples $(DESTDIR)@docdir@
    1.37  	cp ChangeLog NEWS AUTHORS COPYING README TODO $(DESTDIR)@docdir@
    1.38  
    1.39 -log_dir: $(DESTDIR)@with_logdir@
    1.40 -
    1.41 -spool_dir: $(DESTDIR)@with_spooldir@
    1.42  
    1.43  uid_bit: $(DESTDIR)@prefix@/sbin/masqmail
    1.44  	chmod u+s $(DESTDIR)@prefix@/sbin/masqmail
    1.45  
    1.46 +
    1.47  run_dir:
    1.48  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)/var/run/masqmail
    1.49  
    1.50 +
    1.51 +
    1.52 +log_dir: $(DESTDIR)@with_logdir@
    1.53 +
    1.54  $(DESTDIR)@with_logdir@:
    1.55  	[ -d `dirname $(DESTDIR)@with_logdir@` ] || \
    1.56  		install -d `dirname $(DESTDIR)@with_logdir@`
    1.57  	install -d -o @with_user@ -g @with_group@ $(DESTDIR)@with_logdir@
    1.58  
    1.59 +
    1.60 +
    1.61 +spool_dir: $(DESTDIR)@with_spooldir@
    1.62 +
    1.63  $(DESTDIR)@with_spooldir@:
    1.64  	[ -d `dirname $(DESTDIR)@with_spooldir@` ] || \
    1.65  		install -d `dirname $(DESTDIR)@with_spooldir@`