The gh-pages push seems ready for prime time.

diff --git a/doc/Makefile b/doc/Makefile
index 3e3cc5b7ec30847e8269e7b435c2cc4888c260a7..53ec0cff5367ab6d721cb3c97a46d915f43feeaf 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,28 +17,28 @@ all:
 
 doc: html
 
+html: $(addprefix ../html/,$(SGMLS:.sgml=.html))
+
 mostlyclean:
 
 clean:
        $(RM) -r ../html
 
-html: $(addprefix ../html/,$(SGMLS:.sgml=.html))
-
 ../html:
-       mkdir $@
+       @mkdir $@
 
 ../html/%.html: %.sgml | ../html
-       linuxdoc -B html --split=0 --toc=$(TOC_LEVEL) $<
-       mv $(@F) ../html
+       @linuxdoc -B html --split=0 --toc=$(TOC_LEVEL) $<
+       @mv $(@F) ../html
 
 gh-pages: html
 ifdef GH_TOKEN
        git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/oliverschmidt/cc65.git $(GH_PAGES)
        git --work-tree=$(GH_PAGES) --git-dir=$(GH_PAGES)/.git config user.name "Oliver Schmidt"
        git --work-tree=$(GH_PAGES) --git-dir=$(GH_PAGES)/.git config user.email "ol.sc@web.de"
-       $(RM) -r $(GH_PAGES)/test
-       mkdir $(GH_PAGES)/test
-       cp -R ../html/* $(GH_PAGES)/test
+       $(RM) -r $(GH_PAGES)/doc
+       mkdir $(GH_PAGES)/doc
+       cp -R ../html/* $(GH_PAGES)/doc
        git --work-tree=$(GH_PAGES) --git-dir=$(GH_PAGES)/.git add -A .
        -git --work-tree=$(GH_PAGES) --git-dir=$(GH_PAGES)/.git commit -m "Updated doc from commit $(TRAVIS_COMMIT)."
        git --work-tree=$(GH_PAGES) --git-dir=$(GH_PAGES)/.git push