Makefile: Installation refactoring (3)

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index dc091d1e8e81a9f266543750c3f8856b2ec00b40..8dc3098e6534adac288e7bc7e4ca1686de646333 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ man8dir=$(mandir)/man8
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
-docdir=$(prefix)/userv
+docdir=$(share_prefix)/doc/userv
 
 TARGETS=       daemon client
 TARGETS_DOC_PS=        spec.ps overview.ps
@@ -78,19 +78,23 @@ docs:               $(TARGETS_DOC)
 install:       all
                $(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
                $(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
-               $(INSTALL) -d -m 2755 $(etcsubdir) \
-       $(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
-               if test ! -f $(etcsubdir)/system.default; then \
-                       $(INSTALL_DATA) system.default $(etcsubdir); fi
-               if test ! -f $(etcsubdir)/system.override; then \
-                       $(INSTALL_DATA) system.override $(etcsubdir); fi
+               set -e; for f in '' /default.d /services.d /override.d; do \
+                       $(INSTALL) -d -m 2755 $(etcsubdir)$$f;          \
+               done
+               set -e; for f in system.default system.override; do     \
+                       if test ! -f $(etcsubdir)/$$f; then             \
+                               $(INSTALL_DATA) $$f $(etcsubdir);       \
+                       fi;                                             \
+               done
 
 install-strip:
                $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-doc:   $(TARGETS_DOC)
-               $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
-               $(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
+               set -e; for f in $(docdir) $(docdir)/spec.html  \
+                               $(mandir) $(man1dir) $(man8dir); do     \
+                       $(INSTALL) -d -m 2755 $$f;                      \
+               done
                $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
                $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
                $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)