From ee6c23e6c2faff9a635e943426d14971d01a5c85 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Tue, 23 May 2017 16:57:26 -0700
Subject: [PATCH] Extract doc install into a separate target install-doc

This way people who install via Xcode can run `make install-doc` to get
the documentation pages, as Xcode doesn't include them.
---
 Makefile.in | 18 ++++++++++--------
 README.md   |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ff31db5a9..6d6370a9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -651,7 +651,7 @@ xcode-install:
 #
 # Actually do the installation.
 #
-install-force: all install-translations | show-datadir show-sysconfdir show-extra_completionsdir show-extra_functionsdir show-extra_confdir show-mandir
+install-force: all install-translations install-doc | show-datadir show-sysconfdir show-extra_completionsdir show-extra_functionsdir show-extra_confdir show-mandir
 	$v $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	$v for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir);\
@@ -696,13 +696,6 @@ install-force: all install-translations | show-datadir show-sysconfdir show-extr
 	$v $(INSTALL) -m 644 share/tools/web_config/partials/* $(DESTDIR)$(datadir)/fish/tools/web_config/partials/
 	$v $(INSTALL) -m 644 share/tools/web_config/sample_prompts/*.fish $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts/
 	$v $(INSTALL) -m 755 share/tools/web_config/*.py $(DESTDIR)$(datadir)/fish/tools/web_config/
-	@echo "Installing online user documentation";
-	$v $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
-	$v for i in user_doc/html/* CHANGELOG.md; do \
-		if test -f $$i; then \
-			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
-		fi; \
-	done;
 	@echo "Installing more man pages";
 	$v $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1;
 	$v for i in $(MANUALS); do \
@@ -782,6 +775,15 @@ uninstall-translations: show-DESTDIR show-localedir
 	$v rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/fish.mo
 .PHONY: uninstall-translations
 
+install-doc: $(user_doc)
+	@echo "Installing online user documentation";
+	$v $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
+	$v for i in user_doc/html/* CHANGELOG.md; do \
+		if test -f $$i; then \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		fi; \
+	done;
+
 #
 # The build rules for all the commands
 #
diff --git a/README.md b/README.md
index 1cf1dbd08..24993bc81 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ Building the documentation requires Doxygen 1.8.7 or newer.
 
     xcodebuild install
     sudo ditto /tmp/fish.dst /
+    sudo make install-doc
 
 ## Help, it didn't build!