make install: Do not pass -m to install -d; introduce INSTALL_DIR

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 1ed5c0b8c71de631f207ccb322509e8c050dd7ef..1781847d1a3226fef35fc7c3656edd2e3e614a77 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,6 +40,8 @@ INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
 INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
+INSTALL_DIR=$(INSTALL) -d
+INSTALL_DIR_ETC=$(INSTALL_DIR)
 prefix=@prefix@
 exec_prefix=$(prefix)
 share_prefix=$(prefix)/share
@@ -76,11 +78,11 @@ all:                $(TARGETS)
 docs:          $(TARGETS_DOC)
 
 install:       all
-               $(INSTALL) -d $(addprefix $(DESTDIR), $(bindir) $(sbindir))
+               $(INSTALL_DIR) $(addprefix $(DESTDIR), $(bindir) $(sbindir))
                $(INSTALL_PROGRAM) -m 755 daemon $(DESTDIR)$(sbindir)/uservd
                $(INSTALL_PROGRAM) -m 4755 client $(DESTDIR)$(bindir)/userv
                set -e; for f in '' /default.d /services.d /override.d; do \
-                       $(INSTALL) -d -m 2755 $(DESTDIR)$(etcsubdir)$$f; \
+                       $(INSTALL_DIR_ETC) $(DESTDIR)$(etcsubdir)$$f; \
                done
                set -e; for f in system.default system.override; do     \
                        if test ! -f $(DESTDIR)$(etcsubdir)/$$f; then   \
@@ -92,7 +94,7 @@ install-strip:
                $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-doc install-docs:      $(TARGETS_DOC)
-               $(INSTALL) -d -m 2755 $(addprefix $(DESTDIR),   \
+               $(INSTALL_DIR) $(addprefix $(DESTDIR),          \
                        $(docdir) $(docdir)/spec.html           \
                        $(mandir) $(man1dir) $(man8dir)         \
                )