diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-19 01:57:36 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-19 02:25:18 +0100 |
commit | afd566e6335bb41cddab101d95673ab9bd1b9de0 (patch) | |
tree | cece18b6751b03a6f04769d912585e65bb8254fb | |
parent | 82b1d36585249ab55d6f84c8899cc59a5d470d09 (diff) | |
download | org-mode-afd566e6335bb41cddab101d95673ab9bd1b9de0.tar.gz |
Add org-guide.org to the build process
-rw-r--r-- | doc/Makefile | 15 | ||||
-rw-r--r-- | doc/dir | 3 | ||||
-rw-r--r-- | mk/org-fixup.el | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/doc/Makefile b/doc/Makefile index 14dea7e..96fda14 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 @@ -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 439e6e7..760e73a 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))) |