Makefile: create spool directories in a separate target

On some systems we don't want to create these directories, so putting
them in a separate target allows downstream maintainers to use our
Makefile without patching.

diff --git a/Makefile b/Makefile
index d9542bd34c26ec21899779f8375c1735dc12d247..0f99183cce8f9ec291a229e1603dbdbe6e75c6cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,19 +44,21 @@ all: dma dma-mbox-create
 clean:
        -rm -f .depend dma dma-mbox-create *.[do]
        -rm -f aliases_parse.[ch] aliases_scan.c
- 
+
 install: all
        ${INSTALL} -d ${DESTDIR}${SBIN} ${DESTDIR}${CONFDIR}
        ${INSTALL} -d ${DESTDIR}${MAN}/man8 ${DESTDIR}${LIBEXEC}
        ${INSTALL} -m 2755 -o root -g mail dma ${DESTDIR}${SBIN}
        ${INSTALL} -m 4754 -o root -g mail dma-mbox-create ${DESTDIR}${LIBEXEC}
        ${INSTALL} -m 0644 dma.8 ${DESTDIR}${MAN}/man8/
-       ${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${DMASPOOL}
-       ${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${VARMAIL}
 
 sendmail-link:
        cd ${DESTDIR}${SBIN} && ${LN} ${SYMLINK} dma sendmail
 
+install-spool-dirs:
+       ${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${DMASPOOL}
+       ${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${VARMAIL}
+
 permissions:
        -${CHGRP} mail ${DESTDIR}${VARMAIL}/*
        -${CHMOD} g+w ${DESTDIR}${VARMAIL}/*

diff --git a/debian/rules b/debian/rules
index 9d4084eb6e2c3f43bed00acffb0ce606f31f0dfe..9efbcc548fcafd9c93ee5a66c1496b43c4f69635 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_auto_clean:
        $(MAKE) -C $(DDIR)/migrate clean
 
 override_dh_auto_install:
-       $(MAKE) -f Makefile ${BUILDDEFS} install sendmail-link
+       $(MAKE) -f Makefile ${BUILDDEFS} install sendmail-link install-spool-dirs
        install -o root -g mail -m 644 dma.conf $D/etc/dma
        install -o root -g mail -m 640 auth.conf $D/etc/dma