X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1daa04bab784f205a8863d0eebc918444b2a9042..0d66f3e510572d738a78343d672789cf16419eb1:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 820ec74b..413e3f5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,12 +35,24 @@ auxexecdir = @libdir@
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
 	     etc/mhn.defaults man/man.sed $(man_MANS)
+clean-local:
+	@rm -rf RPM a.out.DSYM uip/a.out.DSYM
 
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##
 MAINTAINERCLEANFILES = cscope.files cscope.out
 
+##
+## And our own superclean, to get everything left by maintainer-clean.
+##
+SUPERCLEANFILES = Makefile.in aclocal.m4 compile config.guess config.h.in \
+		  config.h.in~ config.sub configure depcomp install-sh missing \
+		  ylwrap nmh-*.tar.gz
+superclean: maintainer-clean
+	@rm -f $(SUPERCLEANFILES)
+.PHONY: superclean
+
 ##
 ## Files that need to be built before everything else
 ##
@@ -186,10 +198,8 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 
-uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c
-if POP_SUPPORT
-uip_inc_SOURCES += uip/popsbr.c
-endif
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
+		  uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
 
 uip_install_mh_SOURCES = uip/install-mh.c
@@ -227,10 +237,7 @@ uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
 		      uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
 
-uip_msgchk_SOURCES = uip/msgchk.c
-if POP_SUPPORT
-uip_msgchk_SOURCES += uip/popsbr.c
-endif
+uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
 uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
@@ -365,8 +372,8 @@ install-exec-hook:
 	fi
 
 install-data-hook:
-	rm -f $(DESTDIR)/$(man5dir)/mh_profile.5
-	ln $(DESTDIR)/$(man5dir)/mh-profile.5 $(DESTDIR)/$(man5dir)/mh_profile.5
+	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
 ##
@@ -455,11 +462,6 @@ man/man.sed: Makefile
 	echo 's,%manext1%,$(manext1),g' >> $@
 	echo 's,%manext5%,$(manext5),g' >> $@
 	echo 's,%manext8%,$(manext8),g' >> $@
-if POP_SUPPORT
-	echo '/^%nmhbeginpop%/d;/^%nmhendpop%/d' >> $@
-else
-	echo '/^%nmhbeginpop%/,/^%nmhendpop%/d' >> $@
-endif
 	echo '/%components%/r $(top_srcdir)/etc/components' >> $@
 	echo ' s,%components%,,g' >> $@
 	echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
@@ -495,6 +497,7 @@ rpm: dist
 	@rpmbuild --define '_topdir $(rpmdir)' \
 	  --define '_tmppath %{_topdir}/TMP' \
 	  -ba $(rpmdir)/SPECS/nmh.spec
+.PHONY: rpm
 
 ##
 ## A target to build information needed by cscope