copyright: Add Matthew Vernon

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 35a405f78cecb0b66d94022b221538e5a827c385..ec58cd519200b899512d8a39c6e18212cb353a79 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,7 @@
 #  userv - Makefile.in
 #  
-#  userv is
-#  Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
-#  Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
-#  Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
+#  userv is copyright Ian Jackson and other contributors.
+#  See README for full authorship information.
 #  
 #  This is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -40,6 +38,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 +76,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,21 +91,23 @@ install:    all
 install-strip:
                $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-doc:   $(TARGETS_DOC)
-               $(INSTALL) -d -m 2755 $(addprefix $(DESTDIR),   \
-                       $(docdir) $(docdir)/spec.html           \
-                       $(mandir) $(man1dir) $(man8dir)         \
+install-doc install-docs:      $(TARGETS_DOC)
+               $(INSTALL_DIR) $(addprefix $(DESTDIR),                  \
+                       $(docdir) $(docdir)/spec.html $(docdir)/examples \
+                       $(mandir) $(man1dir) $(man8dir)                 \
                )
                $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
                $(INSTALL_DATA) -m 644 spec.html/*.html \
                        $(DESTDIR)$(docdir)/spec.html/.
+               $(INSTALL_DATA) -m 644 system.default system.override \
+                       $(DESTDIR)$(docdir)/examples/.
                $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(DESTDIR)$(man1dir)
                $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)
 
 uninstall:
                rm -f $(bindir)/userv $(sbindir)/uservd
 
-uninstall-doc:
+uninstall-doc uninstall-docs:
                cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
 check: