minor things to make wiki more readable

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a23b2a..0a8a763 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,19 +32,27 @@ clean:
 
 ################################################################################
 # targets
-spool/templates_c spool/uploads spool/wiki.d::
+
+spool/templates_c spool/uploads:
        mkdir -p $@
        chmod o+w $@
 
+spool/wiki.d:
+       mkdir -p $@
+       chmod o+w $@
+       cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+
+
 htdocs/valid.html:
        touch spool/templates_c/valid.html
+       chmod o+w spool/templates_c/valid.html
        cd htdocs && ln -sf ../spool/templates_c/valid.html
 
 htdocs/uploads:
        cd htdocs && ln -sf ../spool/uploads
 
-htdocs/wikipub:
-       cd htdocs && ln -sf ../wiki/pub wikipub
+htdocs/wiki:
+       cd htdocs && ln -sf ../wiki/pub wiki
 
 wiki/local/farmconfig.php:
        cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
@@ -52,11 +60,6 @@ wiki/local/farmconfig.php:
 wiki/pub/skins/empty:
        cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
 
-wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wikipub
-
-spool/wiki.d::
-       cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
-
 get-wiki:
        @if ! test -d wiki; then                                          \
            wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
@@ -68,6 +71,8 @@ get-wiki:
 
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
 
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki
+
 ################################################################################
 
 .PHONY: build dist clean wiki build-wiki