Rearranged whitespace (and comments) in all the code!

[mmh] / man / Makefile.in

diff --git a/man/Makefile.in b/man/Makefile.in
index 88c8c84..2a5a77a 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for man subdirectory
 #
-# $Id$
-#
 
 VERSION = @VERSION@
 DATE = @DATE@
@@ -26,18 +24,12 @@ manext8     = 8
 mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
-default_editor = @editorpath@
-default_pager = @pagerpath@
-
 INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 SED = sed
 SEDMAN = $(SED) -f man.sed $< > $@
 
-# sed line for editing pop information in man pages
-POPSED = @POPSED@
-
 .SUFFIXES:
 .SUFFIXES: .man .$(manext1) .$(manext5) .$(manext8)
 
@@ -51,32 +43,21 @@ POPSED = @POPSED@
        $(SEDMAN)
 
 # man pages to install in $(mandir)/$(manext1)
-MAN1SRC = ali. anno. burst. comp.              \
-       dist. flist. flists. folder. folders.   \
-       forw. inc. install-mh. mark. mh-chart.  \
-       nmh. mhbuild. mhl. mhlist. mhmail.      \
-       mhn. mhparam. mhpath. mhshow.           \
-       mhstore. msgchk. msh.                   \
-       next. packf. pick. prev.                        \
-       prompter. rcvdist. rcvpack.             \
-       rcvstore. rcvtty. refile.               \
-       repl. rmf. rmm. scan.                   \
-       send. sendfiles. show. slocal.          \
-       sortm. whatnow. whom.
-
-MAN5SRC = mh-alias. mh-draft. mh-format.       \
-       mh-mail. mh-profile. mh-sequence.       \
+MAN1SRC = ali. anno. burst. comp. dist. flist. flists. folder. folders.    \
+       forw. inc. install-mh. mark. mh-chart. nmh. mhbuild. mhl. mhlist.   \
+       mhmail. mhparam. mhpath. mhshow. mhstore. msgchk. new. fnext.       \
+       fprev. unseen. next. packf. pick. prev. prompter. rcvdist. rcvpack. \
+       rcvstore. rcvtty. refile. repl. rmf. rmm. scan. send. sendfiles.    \
+       show. slocal. 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.           \
-       mh-mts. post.
+MAN8SRC = ap. conflict. dp. fmtdump. post.
 
-MAN1 := $(MAN1SRC:.=.$(manext1))
-MAN5 := $(MAN5SRC:.=.$(manext5))
-MAN8 := $(MAN8SRC:.=.$(manext8))
-
-# Since vmh is not built or distributed, neither should vmh.1 be
-# MANEXTRA = vmh. 
+MAN1 = $(MAN1SRC:.=.$(manext1))
+MAN5 = $(MAN5SRC:.=.$(manext5))
+MAN8 = $(MAN8SRC:.=.$(manext8))
 
 # source for man pages
 DIST_MANSRC = $(MAN1SRC) $(MAN5SRC) $(MAN8SRC)
@@ -105,12 +86,9 @@ man.sed: Makefile
        echo 's,%mandir%,$(mandir),g' >> $@
        echo 's,%mailspool%,$(mailspool),g' >> $@
        echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-       echo 's,%default_editor%,$(default_editor),g' >> $@
-       echo 's,%default_pager%,$(default_pager),g' >> $@
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@
-       echo '$(POPSED)' >> $@
        echo '/%components%/r $(top_srcdir)/etc/components' >> $@
        echo ' s,%components%,,g' >> $@
        echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
@@ -130,27 +108,27 @@ 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 =========
@@ -160,19 +138,19 @@ 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 ==========
@@ -197,8 +175,8 @@ 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)
        @echo "Copying distribution files in $(subdir)"