~kevin8t8/mutt

0136dbd18e095b5934ea69ecc479b8bc8ac3926f — Kevin McCarthy a month ago 6feaec0
Remove Muttrc and manual.txt from dist tarball files.

The Muttrc needs to be generated because of docdir substitution.  The
manual.txt may traditionally be generated by a different tool than the
one on my machine (lynx), so force that to be regenerated too.

It may still be necessary to just rebuild everything, but let's see if
this will do for stable for now.
1 files changed, 7 insertions(+), 7 deletions(-)

M doc/Makefile.am
M doc/Makefile.am => doc/Makefile.am +7 -7
@@ 47,11 47,11 @@ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)

# Note: these are bundled with a dist tarball, so they should be
# installed from $(srcdir).
#
# Muttrc and stamp-doc-rc are not included because of docdir substitution.
# manual.txt is not included because of different generation tool preferences.
BUILT_DISTFILES = stamp-doc-xml		\
		stamp-doc-chunked	\
		stamp-doc-rc		\
		Muttrc			\
		manual.txt		\
		muttrc.man		\
		$(HTML_DOCFILES)	\
		$(INFO_DOCFILES)


@@ 86,21 86,21 @@ install-data-local: makedoc-all instdoc
	for f in $(srcdir_DOCFILES) ; do \
		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
	done
	-if [ -f $(srcdir)/manual.txt ] ; then \
	  $(INSTALL) -m 644 $(srcdir)/manual.txt $(DESTDIR)$(docdir) ; \
	-if [ -f manual.txt ] ; then \
	  $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) ; \
	fi
	-for f in $(HTML_DOCFILES) ; do \
	  if [ -f $(srcdir)/$$f ] ; then \
	    $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
	  fi \
	done
	$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
		$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
	fi
	-if [ -f $(srcdir)/mutt.info ] ; then \
	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \