Makefile: Installation refactoring (2)

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6a65d7a9e590583d8c249fc7af8a035362fbf155..02014c034502b85454cdc3dd7857b0fe7429fc6c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,14 +42,15 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
 INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
 prefix=@prefix@
 exec_prefix=$(prefix)
+share_prefix=$(prefix)/share
 bindir=$(exec_prefix)/bin
-mandir=$(prefix)/man
+mandir=$(share_prefix)/man
 man1dir=$(mandir)/man1
 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
@@ -77,12 +78,14 @@ 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