Makefile: Installation refactoring (5)

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7957b4cf9c5177bf8722214fa8d0a649c81fe91d..4a13d616a7b858690afc92a90a348129ca2d0949 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   \
@@ -91,11 +93,11 @@ install:    all
 install-strip:
                $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-doc:   $(TARGETS_DOC)
-               set -e; for f in $(docdir) $(docdir)/spec.html  \
-                               $(mandir) $(man1dir) $(man8dir); do     \
-                       $(INSTALL) -d -m 2755 $(DESTDIR)$$f;            \
-               done
+install-doc install-docs:      $(TARGETS_DOC)
+               $(INSTALL_DIR) $(addprefix $(DESTDIR),                  \
+                       $(docdir) $(docdir)/spec.html                   \
+                       $(mandir) $(man1dir) $(man8dir)                 \
+               )
                $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
                $(INSTALL_DATA) -m 644 spec.html/*.html \
                        $(DESTDIR)$(docdir)/spec.html/.
@@ -105,7 +107,7 @@ install-doc:        $(TARGETS_DOC)
 uninstall:
                rm -f $(bindir)/userv $(sbindir)/uservd
 
-uninstall-doc:
+uninstall-doc uninstall-docs:
                cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
 check: