diff --git a/Makefile b/Makefile index a12dc85..afc109a 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ news: > "$(outdir)/news.html" # documentation, styled to match the rest of the website -webdoc: +webdoc: default ./tools/webdoc # publish webroot to remote server using rsync (do not delete files, since we diff --git a/tools/webdoc b/tools/webdoc index 4c332f3..5997c61 100755 --- a/tools/webdoc +++ b/tools/webdoc @@ -52,10 +52,10 @@ git rev-parse --git-dir >/dev/null 2>/dev/null || { path_dest=webroot/manual -path_doc=doc-cp -path_img=$path_doc/img -path_js=$path_doc/interactive.js -path_doc_multi=$path_doc/easejs.html +path_doc="$(pwd)/doc-cp" +path_img="$path_doc/img" +path_js="$path_doc/interactive.js" +path_doc_multi="$path_doc/easejs.html" # style a particular file, rewriting relevant portions of the HTML webify() @@ -107,10 +107,11 @@ git checkout "${WEBDOC_BRANCH:-master}" \ && make html html-single \ && cp -rl doc "$path_doc" \ && git checkout - \ - && ln -sf "../easejs-single.html" "$path_doc_multi/easejs.html" \ + && pwd \ + && ln -sfv "$path_doc/easejs-single.html" "$path_doc_multi/easejs.html" \ && for path in $( find "$path_doc_multi" -name '*.htm?' ) do webify "$path" "../" done \ - && ln -sf "../$path_doc_multi" "$path_dest" \ - && ln -sf "../../$path_img" "../../$path_js" "$path_dest/" + && ln -sfv "$path_doc_multi" "$path_dest" \ + && ln -sfv "$path_img" "$path_js" "$path_dest/"