summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2019-12-28 13:55:20 +0100
committerGitHub <noreply@github.com>2019-12-28 13:55:20 +0100
commitf6d66c0f6f1d8f1f583d9000ee0123450cce8130 (patch)
tree74c5ca5d49c9b62508d9a68addfe45a409e9f39e /utils
parenta52a638ba88466c587fd8afa744434711b1e4822 (diff)
parentb91e07bbf156241f6236b7e26d389e10e37553a3 (diff)
Merge pull request #1776 from return42/makefile-doc
doc: describe Makefile targets & add reST primer
Diffstat (limited to 'utils')
-rw-r--r--utils/makefile.sphinx1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/makefile.sphinx b/utils/makefile.sphinx
index 5cbc5ebdd..2c1922fc9 100644
--- a/utils/makefile.sphinx
+++ b/utils/makefile.sphinx
@@ -198,6 +198,7 @@ $(GH_PAGES)::
$(MAKE) docs
[ -d "gh-pages/.git" ] || git clone $(GIT_URL) gh-pages
-cd $(GH_PAGES); git checkout gh-pages >/dev/null
+ -cd $(GH_PAGES); git pull
-cd $(GH_PAGES); ls -A | grep -v '.git$$' | xargs rm -rf
cp -r $(DOCS_DIST)/* $(GH_PAGES)/
touch $(GH_PAGES)/.nojekyll