X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=0fba888bad944becc1be2afa66e1acaeababc553;hb=5dd60d56dddeb759395a09d4cf725bcc81cdca85;hp=80d87f52c3bfaf14915773bd3c6933e23726bd74;hpb=0cb3c82ac7c780c1588c495a36d725c1ca2a5c76;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 80d87f5..0fba888 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"
@@ -136,7 +137,7 @@ noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a
 ## them, but that might change in the future.
 ##
 noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
-		 h/fmt_compile.h h/fmt_scan.h h/m_setjmp.h h/md5.h h/mf.h \
+		 h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \
 		 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
 		 h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
 		 h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
@@ -174,7 +175,7 @@ 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/replyfilter docs/contrib/build_nmh
 
 ##
 ## Our man pages
@@ -222,7 +223,8 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/unseen.man man/whatnow.man man/whom.man \
 	     test/README $(TESTS) test/inc/deb359167.mbox \
 	     test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
-	     test/inc/md5sums test/post/test-post-common.sh
+	     test/inc/md5sums test/post/test-post-common.sh \
+	     SPECS/nmh.spec
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -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
 
@@ -470,7 +472,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
 		      sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
 		      sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
 		      sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
-		      sbr/m_maildir.c sbr/m_name.c sbr/m_setjmp.c \
+		      sbr/m_maildir.c sbr/m_name.c \
 		      sbr/makedir.c sbr/mts.c sbr/norm_charmap.c sbr/path.c \
 		      sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
 		      sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
@@ -495,7 +497,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
 
@@ -557,14 +561,12 @@ ChangeLog:
 ##
 rpm: dist
 	@test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
-	@test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
 	@mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
 	@cp -p VERSION $(rpmdir)/SOURCES
-	@cp -p docs/contrib/nmh.spec $(rpmdir)/SPECS
 	@rpmbuild --define '_topdir $(rpmdir)' \
 	  --define '_tmppath %{_topdir}/TMP' \
 	  --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \
-	  -ba $(rpmdir)/SPECS/nmh.spec
+	  -ba SPECS/nmh.spec
 .PHONY: rpm
 
 ##
@@ -572,7 +574,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
 
 
@@ -592,7 +594,7 @@ gcov:
 	   gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
 	 done
 	@for i in `find . -name '*.gcno'`; do \
-	   if ! test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then \
+	   if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \
 	     echo untested: $$i; \
 	   fi; \
 	 done
@@ -623,5 +625,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