X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=man%2FMakefile.in;h=fe70265db5811b75bc387f26489fa0c80b1a716c;hp=24d63c28c0eb53e84dcd4df30f80b97951554175;hb=fb49dd82ec42997b9df97f221c920f6596102c0a;hpb=ce2545144845a393150638904a4a27e94f62659d

diff --git a/man/Makefile.in b/man/Makefile.in
index 24d63c2..fe70265 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -50,18 +50,11 @@ POPSED = @POPSED@
 .man.$(manext8):
 	$(SEDMAN)
 
-# include file for the man pages.  It is installed
-# in the nmh library directory.
-HDR = tmac.h
-
-# input file for header
-DIST_HDR = tmac.h.in
-
 # man pages to install in $(mandir)/$(manext1)
 MAN1SRC = ali. anno. burst. comp.		\
        dist. flist. flists. folder. folders.	\
-       forw. inc. mark. mh-chart. nmh.		\
-       mhbuild. mhl. mhlist. mhmail.		\
+       forw. inc. install-mh. mark. mh-chart.	\
+       nmh. mhbuild. mhl. mhlist. mhmail.	\
        mhn. mhparam. mhpath. mhshow.		\
        mhstore. msgchk. msh.			\
        next. packf. pick. prev.			\
@@ -69,19 +62,22 @@ MAN1SRC = ali. anno. burst. comp.		\
        rcvstore. rcvtty. refile.		\
        repl. rmf. rmm. scan.			\
        send. sendfiles. show. slocal.		\
-       sortm. vmh. whatnow. whom.
+       sortm. whatnow. whom.
 
 MAN5SRC = mh-alias. mh-draft. mh-format.	\
        mh-mail. mh-profile. mh-sequence.	\
        mh-tailor. mts.conf.
 
 MAN8SRC = ap. conflict. dp. fmtdump.		\
-       install-mh. mh-mts. post.
+       post.
 
 MAN1 = $(MAN1SRC:.=.$(manext1))
 MAN5 = $(MAN5SRC:.=.$(manext5))
 MAN8 = $(MAN8SRC:.=.$(manext8))
 
+# Since vmh is not built or distributed, neither should vmh.1 be
+# MANEXTRA = vmh. 
+
 # source for man pages
 DIST_MANSRC = $(MAN1SRC) $(MAN5SRC) $(MAN8SRC)
 DIST_MAN = $(DIST_MANSRC:.=.man)
@@ -90,17 +86,14 @@ DIST_MAN = $(DIST_MANSRC:.=.man)
 AUX = Makefile.in
 
 # all files in this directory included in the distribution
-DIST = $(DIST_HDR) $(DIST_MAN) $(AUX)
+DIST = $(DIST_MAN) $(AUX)
 
 # ========= DEFAULT TARGET ==========
 
-all: tmac.h $(MAN1) $(MAN5) $(MAN8)
+all: $(MAN1) $(MAN5) $(MAN8)
 
 $(MAN1) $(MAN5) $(MAN8): man.sed
 
-tmac.h: man.sed tmac.h.in
-	$(SED) -f man.sed $(srcdir)/tmac.h.in > $@
-
 # create the sed file for building man pages
 man.sed: Makefile
 	echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
@@ -126,65 +119,60 @@ man.sed: Makefile
 	echo ' s,%forwcomps%,,g' >> $@
 	echo '/%mhl_forward%/r $(top_srcdir)/etc/mhl.forward' >> $@
 	echo ' s,%mhl_forward%,,g' >> $@
+	echo '/%mhl_format%/r $(top_srcdir)/etc/mhl.format' >> $@
+	echo ' s,%mhl_format%,,g' >> $@
+	echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
+	echo ' s,%mhl_reply%,,g' >> $@
 
 # ========= INSTALL TARGETS =========
 
-install: install-hdr install-man1 install-man5 install-man8
-
-# install the include file for man pages
-install-hdr:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
-	$(INSTALL_DATA) tmac.h $(etcdir)/tmac.h
+install: install-man1 install-man5 install-man8
 
 # install the man pages in man1
 install-man1:
-	$(top_srcdir)/mkinstalldirs $(mandir)/man$(manext1)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
 	for file in $(MAN1); do \
-	  $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
 	done
 
 # install the man pages in man5
 install-man5:
-	$(top_srcdir)/mkinstalldirs $(mandir)/man$(manext5)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
 	for file in $(MAN5); do \
-	  $(INSTALL_DATA) $$file $(mandir)/man$(manext5) ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
 	done
-	if [ ! -f $(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
-	  ( cd $(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
+	if [ ! -f $(DESTDIR)$(mandir)/man$(manext5)/mh_profile.$(manext5) ] ; then \
+	  ( cd $(DESTDIR)$(mandir)/man$(manext5) ; ln mh-profile.$(manext5) \
             mh_profile.$(manext5) ) \
 	fi
 
 # install the man pages in man8
 install-man8:
-	$(top_srcdir)/mkinstalldirs $(mandir)/man$(manext8)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
 	for file in $(MAN8); do \
-	  $(INSTALL_DATA) $$file $(mandir)/man$(manext8) ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
 	done
 
 # ========= UNINSTALL TARGETS =========
 
-uninstall: uninstall-hdr uninstall-man1 uninstall-man5 uninstall-man8
-
-# uninstall the include file for man pages
-uninstall-hdr:
-	rm -f $(etcdir)/tmac.h
+uninstall: uninstall-man1 uninstall-man5 uninstall-man8
 
 # uninstall the man pages in man1
 uninstall-man1:
 	for file in $(MAN1); do \
-	  rm -f $(mandir)/man$(manext1)/$$file; \
+	  rm -f $(DESTDIR)$(mandir)/man$(manext1)/$$file; \
 	done
 
 # uninstall the man pages in man5
 uninstall-man5:
 	for file in $(MAN5); do \
-	  rm -f $(mandir)/man$(manext5)/$$file; \
+	  rm -f $(DESTDIR)$(mandir)/man$(manext5)/$$file; \
 	done
 
 # uninstall the man pages in man8
 uninstall-man8:
 	for file in $(MAN8); do \
-	  rm -f $(mandir)/man$(manext8)/$$file; \
+	  rm -f $(DESTDIR)$(mandir)/man$(manext8)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -193,7 +181,7 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f man.sed tmac.h *.$(manext1) *.$(manext5) *.$(manext8)
+	rm -f man.sed *.$(manext1) *.$(manext5) *.$(manext8)
 
 distclean: clean
 	rm -f Makefile
@@ -209,7 +197,7 @@ lint:
 subdir = man
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)