Build bugfixes (re version.h) and changelog updated.

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index dde68cae937cdf6c703d1a5939e8a7610da4efc7..58a4a5afbdcab284ee0272473bd321cff5cee445 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ LEX=flex
 CWD=$(shell pwd)
 
 INSTALL_GROUP=root
-INSTALL_FLAGS=-u root -g $(INSTALL_GROUP)
+INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
 
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
@@ -54,6 +54,9 @@ SOURCES=      Makefile.in configure.in acconfig.h                     \
                daemon.h debug.c parser.c lib.c lib.h                   \
                language.i4 lexer.l.m4 tokens.h.m4
 
+CONFIG_RESULTS=        config.status config.log config.h config.cache \
+               Makefile pcsum.h
+
 GENSHIP_CLEAN= lexer.l lexer.c tokens.h config.h.in spec.sgml $(TARGETS_DOC)
 GENSHIP=       $(GENSHIP_CLEAN) configure
 
@@ -66,7 +69,7 @@ install:      all
                $(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 
+               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
@@ -133,23 +136,27 @@ clean:
                find -name '*.orig' -o -name '*~' -o -name '.*~' \
                        -o -name '*#' -o -name '.#*' -o -name '*.bak' \
                        | xargs -r rm
-               rm -rf $(TARGETS) *.o
+               rm -rf $(TARGETS) *.o version.h
                rm -f overview.eps
-               rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new spec.html/*.html
+               rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new
                rm -f lout.li *.ld *.lix *.ldx
                rm -f userv-*.tar.gz vd/*
 
 distclean mostlyclean: clean
-               rm -f config.status config.log Makefile config.h config.cache pcsum.h
+               rm -f $(CONFIG_RESULTS)
 
 maintainer-clean:      distclean
-               rm -rf $(GENSHIP_CLEAN)
+               rm -rf $(GENSHIP_CLEAN) spec.html/*.html
+
+dist-prep:     $(GENSHIP)
 
-dist-prep:     $(GENSHIP) distclean
+pre-checkin:
+               ./configure
+               $(MAKE) dist-prep
 
 dist_tmp=dist_tmp/userv-$(VERSION)
 dist_prune=\( -name CVS -o -name 'dist_tmp*' -o -name slash-etc -o -name vd \)
-dist:                  dist-prep
+dist:                  dist-prep distclean
        rm -rf dist_tmp*
        mkdir dist_tmp $(dist_tmp)
        find $(dist_prune) -prune -o -type d -print | \
@@ -164,7 +171,7 @@ linecount:  $(SOURCES)
                wc -l $^
 
 %.html:                %.sgml
-               rm -rf $@; debiandoc2html $<
+               debiandoc2html $<
 
 %.ps:          %.sgml
                debiandoc2ps -1 -O $< >$@.new && mv $@.new $@