build: drop instdoc script

This script performed some string substitutions in the files it was
installing.  This was already done by the Makefile.

diff --git a/.gitignore b/.gitignore
index 9c95d5a039c2f1a033e301c1dbdc6056d0d42fa3..87efbd200cd199ce920206ee7b3938e080b8e11a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ stamp-h1
 # Ignored within subdirectories
 doc/*.1
 doc/*.html
-doc/instdoc.sh
 doc/makedoc
 doc/manual.txt
 doc/manual.xml

diff --git a/configure.ac b/configure.ac
index c3866a3d61587f8a6a95ae72dfb75d6c9834f638..792f7905aea0eaab5c1040ed4975884101816e66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -966,7 +966,7 @@ if test x$full_doc != xno; then
 fi
 
 AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile
-       m4/Makefile po/Makefile.in hcache/Makefile doc/instdoc.sh ncrypt/Makefile)
+       m4/Makefile po/Makefile.in hcache/Makefile ncrypt/Makefile)
 AC_OUTPUT
 
 AC_MSG_NOTICE([Summary of build options:

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0931be2bfb9cf791187f59b3c47a962b49d98a1e..260c61353b0a69945c1d97fea2c4adcc32719ff6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = smime_keys.man             \
        mmdf.man                        \
        manual.xml.head                 \
        manual.xml.tail                 \
-       instdoc.sh.in                   \
        smime-notes.txt                 \
        Muttrc Muttrc.head \
        makedoc.c makedoc_defs.h        \
@@ -49,17 +48,17 @@ all: makedoc-all
 
 makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html Muttrc index.html $(CHUNKED_DOCFILES) manual.txt pgpewrap.1 pgpring.1 neomutt-syntax.vim
 
-install-data-local: makedoc-all instdoc
+install-data-local: makedoc-all
        $(MKDIR_P) $(DESTDIR)$(mandir)/man1
        $(MKDIR_P) $(DESTDIR)$(mandir)/man5
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
-       ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
-       ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
-       ./instdoc pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
-       ./instdoc pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
-       ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-       ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
-       ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
+       $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
+       $(INSTALL) -m 644 smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
+       $(INSTALL) -m 644 pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
+       $(INSTALL) -m 644 pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
+       $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+       $(INSTALL) -m 644 $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+       $(INSTALL) -m 644 $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
        $(MKDIR_P) $(DESTDIR)$(docdir)
        for f in $(topsrcdir_DOCFILES) ; do \
                $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
@@ -137,11 +136,7 @@ clean-local:
        rm -f *~ *.html *.orig *.rej  *.ps mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1
        rm -f *.aux *.log *.tex *.out
 
-DISTCLEANFILES=manual.txt manual.html manual.xml instdoc Muttrc
-
-instdoc: instdoc.sh
-       cp instdoc.sh instdoc
-       chmod a+x instdoc
+DISTCLEANFILES=manual.txt manual.html manual.xml Muttrc
 
 muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
        $(MAKEDOC_CPP) $(top_srcdir)/init.h | \