X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=e68973d1402ebdac050bfb7bd20fb6591b3fdf30;hb=4078e8a24878c584541a6caa8554c751121ab2b4;hp=56ecdb1cf366cd3b4013eafc6e75f0144859af5c;hpb=49e0326aeef4cdc75898bf3049bfa3c123688e0f;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 56ecdb1..e68973d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,7 +174,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 +430,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
 
@@ -495,7 +496,9 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DDEFAULT_PAGER='"$(pagerpath)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
-sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
+sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
+			 $(DISABLE_UNUSED_MACROS_WARNING) \
+			 $(DISABLE_SIGN_COMPARE_WARNING)
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
@@ -572,7 +575,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
 
 
@@ -623,5 +626,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