From afd566e6335bb41cddab101d95673ab9bd1b9de0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 19 Mar 2019 01:57:36 +0100
Subject: [PATCH] Add org-guide.org to the build process

---
 doc/Makefile    | 15 +++++++++------
 doc/dir         |  3 ++-
 mk/org-fixup.el |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 14dea7ec6..96fda1445 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,7 @@ endif
 
 all:		$(ORG_MAKE_DOC)
 
-info:		org
+info:		org orgguide
 
 html:		org.html
 
@@ -27,7 +27,7 @@ guide::		orgguide.texi org-version.inc
 	../mk/guidesplit.pl $@/*
 endif
 
-org.texi:	org-manual.org
+org.texi orgguide.texi:	org-manual.org org-guide.org
 	$(BATCH) \
 	  --eval '(add-to-list '"'"'load-path "../lisp")' \
 	  --eval '(load "../mk/org-fixup.el")' \
@@ -46,21 +46,24 @@ org-version.tex:	orgcard.tex
 	@printf "\def\\\\versionyear{$(YEAR)}\n" >> org-version.tex
 	@printf "\def\year{$(YEAR)}\n" >> org-version.tex
 
-install:	org
+install:	org orgguide
 	if [ ! -d $(DESTDIR)$(infodir) ]; then $(MKDIR) $(DESTDIR)$(infodir); else true; fi ;
 	$(CP) org $(DESTDIR)$(infodir)
+	$(CP) orgguide $(DESTDIR)$(infodir)
 	$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org
+	$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide
 
 clean:
-	$(RM) org *.pdf *.html *_letter.tex org-version.inc org-version.tex \
-	      *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs \
-	      *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps
+	$(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \
+	      org-version.tex *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys \
+              *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps
 cleanall:	clean
 	$(RMR) guide manual
 
 clean-install:
 	$(RM) $(DESTDIR)$(infodir)/org*
 	$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) --remove org
+	$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) --remove orgguide
 
 .SUFFIXES:	.texi .tex .txt _letter.tex
 
diff --git a/doc/dir b/doc/dir
index 9610c4040..6c75b5de9 100644
--- a/doc/dir
+++ b/doc/dir
@@ -15,4 +15,5 @@ File: dir,	Node: Top	This is the top of the INFO tree
 * Menu:
 
 Emacs
-* Org Mode: (org).      Outline-based notes management and organizer
+* Org Mode: (org).        Outline-based notes management and organizer.
+* Org Guide: (orgguide).  Abbreviated Org mode manual.
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 439e6e7f7..760e73a16 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -30,7 +30,7 @@
 (defun org-make-manuals ()
   "Generate the Texinfo files out of Org manuals."
   (require 'ox-texinfo)
-  (dolist (manual '("../doc/org-manual.org"))
+  (dolist (manual '("../doc/org-manual.org" "../doc/org-guide.org"))
     (find-file manual)
     (org-texinfo-export-to-texinfo)))