Upstream Makefiles: Honour XCFLAGS.

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9d04c2b0bc26ca38b9339037a1d7ea0ee67f7780..d36c6c6eae8f77a0d8bf1267a8eb245cc121ccad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ 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)
@@ -28,10 +28,10 @@ LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 M4=m4
 M4FLAGS=
 LEX=flex
-MD5SUM=@MD5SUM@
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
-INSTALL_GROUP=root
+INSTALL_GROUP=0  # root or wheel
 INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
 
 INSTALL=@INSTALL@
@@ -42,6 +42,7 @@ exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
 mandir=$(prefix)/man
 man1dir=$(mandir)/man1
+man8dir=$(mandir)/man8
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
@@ -52,6 +53,7 @@ TARGETS_DOC_PS=       spec.ps overview.ps
 TARGETS_DOC_RM=        $(TARGETS_DOC_PS) spec.html
 TARGETS_DOC=   $(TARGETS_DOC_PS) spec.html/index.html
 MAN1PAGES=     userv.1
+MAN8PAGES=     uservd.8
 
 SOURCES=       Makefile.in configure.in acconfig.h                     \
                client.c common.h                                       \
@@ -84,10 +86,11 @@ install-strip:
 
 install-doc:   $(TARGETS_DOC)
                $(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
-               $(INSTALL) -d -m 2755 $(mandir) $(man1dir)
+               $(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
                $(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
                $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
                $(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
+               $(INSTALL_DATA) -m 644 $(MAN8PAGES) $(man8dir)
 
 uninstall:
                rm -f $(bindir)/userv $(sbindir)/uservd
@@ -95,6 +98,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)
 
@@ -145,7 +151,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/*