4 files changed, 13 insertions, 28 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 93083cd..9d4f361 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,19 +3,27 @@ all: manual src man-html
 install-deps:
 	emacs --batch --load ./res/install-deps.el
 
+%.man: %.org
+	emacs --batch --file $< --load ./res/publish.el --funcall org-man-export-to-man
+
+%.html: %.org
+	emacs --batch --file $< --load ./res/publish.el --funcall org-html-export-to-html
+
 manual:
 	mkdir -p manual
-	emacs --batch --file documentation.org --load ./res/publish-manual.el
+	emacs --batch --file documentation.org --load ./res/publish.el --funcall org-texinfo-export-to-texinfo
 	makeinfo --html --number-sections --no-split \
         --css-ref "https://www.gnu.org/software/emacs/manual.css" \
         vericert.texi -o ./manual/index.html
 	cp -r images ./manual/.
 
-man-html:
+man-html: man.html
 	mkdir -p man
-	emacs --batch --file man.org --load ./res/publish-html.el
 	cp man.html ./man/vericert.1.html
 
+vericert.1: man.man
+	cp $< $@
+
 src:
 	$(MAKE) -C .. doc
 	cp -r ../html src
diff --git a/docs/res/publish-man.el b/docs/res/publish-man.el
deleted file mode 100644
index 634b454..0000000
--- a/docs/res/publish-man.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(require 'package)
-(package-initialize)
-
-(require 'org)
-(require 'org-transclusion)
-(require 'ox)
-(require 'ox-man)
-
-(setq org-transclusion-exclude-elements nil)
-
-(org-transclusion-add-all)
-(org-man-export-to-man)
diff --git a/docs/res/publish-manual.el b/docs/res/publish-manual.el
deleted file mode 100644
index df5db6b..0000000
--- a/docs/res/publish-manual.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(require 'package)
-(package-initialize)
-
-(require 'org)
-(require 'org-transclusion)
-(require 'ox)
-(require 'ox-texinfo)
-
-(setq org-transclusion-exclude-elements nil)
-
-(org-transclusion-add-all)
-(org-texinfo-export-to-texinfo)
diff --git a/docs/res/publish-html.el b/docs/res/publish.el
index a9c7a9d..c083eb0 100644
--- a/docs/res/publish-html.el
+++ b/docs/res/publish.el
@@ -6,6 +6,8 @@
 (require 'ox)
 (require 'ox-html)
 (require 'htmlize)
+(require 'ox-texinfo)
+(require 'ox-man)
 
 (setq org-transclusion-exclude-elements nil
       org-html-head-include-default-style nil
@@ -19,4 +21,3 @@
       org-html-htmlize-output-type 'css)
 
 (org-transclusion-add-all)
-(org-html-export-to-html)