Makefile: Installation refactoring (1)

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 27609214a349c06d7357d0c7d7662b09a89a1559..6221dabd0b9491fc3dc038b31dd30d738d1f3796 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,13 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997,1999 Ian Jackson
+#  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>
 #  
 #  This is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
 #  
 #  This program is distributed in the hope that it will be useful, but
@@ -13,14 +16,14 @@
 #  General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with userv; if not, write to the Free Software
-#  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 VERSION=@VERSION@
 VEREXT=std
 
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR) $(XCFLAGS)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
@@ -31,7 +34,7 @@ LEX=flex
 MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
-INSTALL_GROUP=root
+INSTALL_GROUP=0  # root or wheel
 INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
 
 INSTALL=@INSTALL@
@@ -39,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
@@ -74,8 +78,9 @@ 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
+               set -e; for f in '' /default.d /services.d /override.d; do \
+                       $(INSTALL) -d -m 2755 $(etcsubdir)$$f;          \
+               done
                if test ! -f $(etcsubdir)/system.default; then \
                        $(INSTALL_DATA) system.default $(etcsubdir); fi
                if test ! -f $(etcsubdir)/system.override; then \
@@ -98,6 +103,9 @@ uninstall:
 uninstall-doc:
                cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
+check:
+               @echo There is no validation suite for this package.
+
 daemon:                overlord.o process.o servexec.o parserlexer.o debug.o lib.o both.o
                $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
@@ -148,7 +156,7 @@ clean:
                        | xargs -r rm
                rm -rf $(TARGETS) *.o core version.h
                rm -f overview.eps
-               rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new
+               rm -f spec.lout* spec.text* spec.ps* spec.sgml.new spec.tex
                rm -f lout.li *.ld *.lix *.ldx
                rm -f userv-*.tar.gz vd/*