From: Pietro Cerutti <gahr@gahr.ch>
Date: Mon, 16 Oct 2017 11:23:05 +0000 (+0000)
Subject: Generate neomuttrc even if configured with --disable-doc
X-Git-Tag: neomutt-20171027~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0896f73492a09d97b67785fe516ada68908252a;p=neomutt

Generate neomuttrc even if configured with --disable-doc

Issue #862
---

diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup
index 174a52513..93b8b8f74 100644
--- a/doc/Makefile.autosetup
+++ b/doc/Makefile.autosetup
@@ -1,7 +1,13 @@
-@if BUILD_DOC
-
 MAKEDOC_CPP = $(CPP) $(CPPFLAGS) -D_MAKEDOC -C -I.
 
+doc/neomuttrc: $(SRCDIR)/init.h doc/makedoc$(EXEEXT) $(SRCDIR)/doc/neomuttrc.head
+	sed -e 's,@docdir@,$(docdir),' $(SRCDIR)/doc/neomuttrc.head \
+	    > doc/neomuttrc
+	$(MAKEDOC_CPP) $(SRCDIR)/init.h | doc/makedoc$(EXEEXT) -c \
+	    >> doc/neomuttrc
+
+@if BUILD_DOC
+
 CHUNKED_DOCFILES = doc/advancedusage.html \
 		   doc/configuration.html \
 		   doc/gettingstarted.html \
@@ -33,12 +39,6 @@ all-doc: 	$(CHUNKED_DOCFILES) \
 		doc/neomuttrc.man \
 		doc/neomutt-syntax.vim
 
-doc/neomuttrc: $(SRCDIR)/init.h doc/makedoc$(EXEEXT) $(SRCDIR)/doc/neomuttrc.head
-	sed -e 's,@docdir@,$(docdir),' $(SRCDIR)/doc/neomuttrc.head \
-	    > doc/neomuttrc
-	$(MAKEDOC_CPP) $(SRCDIR)/init.h | doc/makedoc$(EXEEXT) -c \
-	    >> doc/neomuttrc
-
 doc/manual.html:	doc/manual.xml \
     			$(SRCDIR)/doc/html.xsl \
 			$(SRCDIR)/doc/neomutt.xsl \
@@ -146,10 +146,19 @@ sortcheck-doc: doc/manual.xml
 	$(RM) doc/vars.tmp.1 doc/vars.tmp.2
 
 @else
-all-doc:
+# Let's generate neomuttrc in all cases: it doesn't require any additional 3rd
+# party dependencies and distributions tend to rely on having it.
+all-doc: doc/neomuttrc
+
 clean-doc:
-install-doc:
+	$(RM) doc/neomuttrc
+
+install-doc: all-doc
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+	$(INSTALL) -m 644 doc/neomuttrc $(DESTDIR)$(sysconfdir)/neomuttrc
+
 uninstall-doc:
+	$(RM) $(DESTDIR)$(sysconfdir)/neomuttrc
 @endif
 
 # vim: set ts=8 noexpandtab: