diff options
| author | Kevin McCarthy <kevin@8t8.us> | 2020-05-26 13:57:18 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2020-05-26 13:57:18 -0700 |
| commit | d3fd97b405f9074b1968870fc567dbc89c7abad6 (patch) | |
| tree | 613f6408b7e2ce026aa7e33e835b8f4d908c48b9 /doc | |
| parent | 52f5694b6386c13871de847206aa05414aad36b3 (diff) | |
| parent | 0136dbd18e095b5934ea69ecc479b8bc8ac3926f (diff) | |
Merge branch 'stable'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 8b5971f3..1bf4fdcf 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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) ; \ |