X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=7326a5bf4efd6a9ceaa5cccf542769dab97f4083;hb=305304bcc8a55a2faea31c551ccc66d984e63bd1;hp=636f2218808e87984ede6ed3329e99c0a41e3470;hpb=596904cf07f08b3c28898a4c397eb1caf9aa9873;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 636f221..7326a5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ TESTS = test/bad-input/test-header \
 
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
+DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"
@@ -174,7 +175,8 @@ dist_doc_DATA = COPYRIGHT VERSION docs/COMPLETION-BASH docs/COMPLETION-TCSH \
 ## Contribs that get installed in docdir/contrib/
 ##
 contribdir = $(docdir)/contrib
-dist_contrib_DATA = docs/contrib/nmh.spec docs/contrib/replyfilter
+dist_contrib_DATA = docs/contrib/nmh.spec docs/contrib/replyfilter \
+                    docs/contrib/build_nmh
 
 ##
 ## Our man pages
@@ -429,7 +431,7 @@ install-exec-hook:
 	ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT)
 	if test x$(SETGID_MAIL) != x; then \
-		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT); \
+		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
 	fi
 
@@ -574,7 +576,7 @@ rpm: dist
 ##
 cscope:
 	echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
-	find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
+	find $(srcdir) \( -name docs -prune \) -o \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files
 .PHONY: cscope
 
 
@@ -625,5 +627,5 @@ upload: dist
 		chmod 664 $(DIST_ARCHIVES).sig; \
 	fi
 	@echo "Uploading to savannah"
-	scp -p $(DIST_ARCHIVES)* $(SAVANNAH_USERNAME)@savannah.gnu.org:/releases/nmh
+	scp -p $(DIST_ARCHIVES)* $(SAVANNAH_USERNAME)@dl.sv.nongnu.org:/releases/nmh
 .PHONY: upload