X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/305304bcc8a55a2faea31c551ccc66d984e63bd1..fa87949f51fea475ba7c19a2aac57f49eebb56a2:/Makefile.am?ds=inline

diff --git a/Makefile.am b/Makefile.am
index 7326a5bf..adf3f890 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,8 +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 \
-                    docs/contrib/build_nmh
+dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh
 
 ##
 ## Our man pages
@@ -186,7 +185,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   man/fmtdump.8 man/fnext.1 man/folder.1 man/folders.1 \
 	   man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
 	   man/mh-alias.5 man/mh-chart.1 man/mh-draft.5 man/mh-format.5 \
-	   man/mh-mail.5 man/mh-profile.5 man/mh-sequence.5 \
+	   man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 man/mh-sequence.5 \
 	   man/mh-tailor.5 man/mhbuild.1 man/mhl.1 man/mhlist.1 \
 	   man/mhmail.1 man/mhn.1 man/mhparam.1 man/mhpath.1 \
 	   man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \
@@ -211,11 +210,11 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/folders.man man/forw.man man/fprev.man man/inc.man \
 	     man/install-mh.man man/mark.man man/mh-alias.man \
 	     man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \
-	     man/mh-mail.man man/mh-profile.man man/mh-sequence.man \
-	     man/mh-tailor.man man/mhbuild.man man/mhl.man man/mhlist.man \
-	     man/mhmail.man man/mhn.man man/mhparam.man man/mhpath.man \
-	     man/mhshow.man man/mhstore.man man/msgchk.man man/msh.man \
-	     man/mts.conf.man man/new.man man/next.man man/nmh.man \
+	     man/mh-mail.man man/mh-profile.man man/mh_profile.man \
+	     man/mh-sequence.man man/mh-tailor.man man/mhbuild.man man/mhl.man \
+	     man/mhlist.man man/mhmail.man man/mhn.man man/mhparam.man \
+	     man/mhpath.man man/mhshow.man man/mhstore.man man/msgchk.man \
+	     man/msh.man man/mts.conf.man man/new.man man/next.man man/nmh.man \
 	     man/packf.man man/pick.man man/post.man man/prev.man \
 	     man/prompter.man man/rcvdist.man man/rcvpack.man \
 	     man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
@@ -224,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.
@@ -435,9 +435,6 @@ install-exec-hook:
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
 	fi
 
-install-data-hook:
-	rm -f $(DESTDIR)$(man5dir)/mh_profile.5
-	ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5
 ##
 ## Make sure we remove those links at uninstall time
 ##
@@ -449,7 +446,6 @@ uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
-	rm -f $(DESTDIR)$(man5dir)/mh_profile.5
 
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
@@ -561,14 +557,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
 
 ##
@@ -596,7 +590,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