Fixed mhstore to honor nmh-storage profile entry even with -auto [Bug #35303].

[mmh] / man / Makefile.in

diff --git a/man/Makefile.in b/man/Makefile.in
index 4d4dec9..e7f58be 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -16,6 +16,7 @@ exec_prefix = @exec_prefix@
 bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
+datarootdir = @datarootdir@
 mandir      = @mandir@
 manext1     = 1
 manext5     = 5
@@ -29,7 +30,7 @@ INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 SED = sed
-SEDMAN = $(SED) -f man.sed $< > $@
+SEDMAN = @$(SED) -f man.sed $< > $@
 
 .SUFFIXES:
 .SUFFIXES: .man1 .man5 .man7 .man8 \
@@ -59,7 +60,7 @@ MAN5SRC = mh-alias. mh-format. mh-mail. mh-profile. mh-tailor.
 
 MAN7SRC = mmh-intro. mh-draft. mh-sequence. 
 
-MAN8SRC = ap. conflict. dp. fmtdump. post.
+MAN8SRC = ap. dp. fmtdump. post.
 
 MAN1 = $(MAN1SRC:.=.$(manext1))
 MAN5 = $(MAN5SRC:.=.$(manext5))
@@ -86,31 +87,31 @@ $(MAN1) $(MAN5) $(MAN7) $(MAN8): man.sed
 
 # create the sed file for building man pages
 man.sed: Makefile
-       echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
-       echo 's,%nmhversion%,mmh-$(VERSION),g' >> $@
-       echo 's,%nmhdate%,$(DATE),g' >> $@
-       echo 's,%bindir%,$(bindir),g' >> $@
-       echo 's,%etcdir%,$(etcdir),g' >> $@
-       echo 's,%libdir%,$(libdir),g' >> $@
-       echo 's,%mandir%,$(mandir),g' >> $@
-       echo 's,%mailspool%,$(mailspool),g' >> $@
-       echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-       echo 's,%manext1%,$(manext1),g' >> $@
-       echo 's,%manext5%,$(manext5),g' >> $@
-       echo 's,%manext7%,$(manext7),g' >> $@
-       echo 's,%manext8%,$(manext8),g' >> $@
-       echo '/%components%/r $(top_srcdir)/etc/components' >> $@
-       echo ' s,%components%,,g' >> $@
-       echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
-       echo ' s,%distcomps%,,g' >> $@
-       echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
-       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' >> $@
+       @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
+       @echo 's,%nmhversion%,mmh-$(VERSION),g' >> $@
+       @echo 's,%nmhdate%,$(DATE),g' >> $@
+       @echo 's,%bindir%,$(bindir),g' >> $@
+       @echo 's,%etcdir%,$(etcdir),g' >> $@
+       @echo 's,%libdir%,$(libdir),g' >> $@
+       @echo 's,%mandir%,$(mandir),g' >> $@
+       @echo 's,%mailspool%,$(mailspool),g' >> $@
+       @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
+       @echo 's,%manext1%,$(manext1),g' >> $@
+       @echo 's,%manext5%,$(manext5),g' >> $@
+       @echo 's,%manext7%,$(manext7),g' >> $@
+       @echo 's,%manext8%,$(manext8),g' >> $@
+       @echo '/%components%/r $(top_srcdir)/etc/components' >> $@
+       @echo ' s,%components%,,g' >> $@
+       @echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
+       @echo ' s,%distcomps%,,g' >> $@
+       @echo '/%forwcomps%/r $(top_srcdir)/etc/forwcomps' >> $@
+       @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 =========
 
@@ -118,28 +119,28 @@ install: install-man1 install-man5 install-man7 install-man8
 
 # install the man pages in man1
 install-man1:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
+       mkdir -p $(DESTDIR)$(mandir)/man$(manext1)
        for file in $(MAN1); do \
          $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
        done
 
 # install the man pages in man5
 install-man5:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
+       mkdir -p $(DESTDIR)$(mandir)/man$(manext5)
        for file in $(MAN5); do \
          $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
        done
 
 # install the man pages in man7
 install-man7:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext7)
+       mkdir -p $(DESTDIR)$(mandir)/man$(manext7)
        for file in $(MAN7); do \
          $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext7) ; \
        done
 
 # install the man pages in man8
 install-man8:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
+       mkdir -p $(DESTDIR)$(mandir)/man$(manext8)
        for file in $(MAN8); do \
          $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
        done
@@ -197,7 +198,7 @@ Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
+mmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \