group 0777 dirs in spool/

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@77 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/Makefile b/Makefile
index 1fa5447..26b7352 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ headers:
        headache -c install.d/platal-dev/templates/header.conf -h install.d/platal-dev/templates/header \
                `find templates -name '*.tpl' ! -path 'templates/xnet/skin.tpl' ! -path 'templates/skin/*.tpl' ! -name 'vcard.tpl' `
 
-build: templates_c wiki
+build: spool/templates_c wiki
 
 clean:
        rm -rf include/platal/globals.inc.php
@@ -32,7 +32,7 @@ clean:
 
 ################################################################################
 # targets
-templates_c uploads wiki.d::
+spool/templates_c spool/uploads spool/wiki.d::
        mkdir -p $@
        chmod o+w $@
 
@@ -41,7 +41,7 @@ htdocs/valid.html:
        cd htdocs && ln -sf ../templates_c/valid.html
 
 htdocs/uploads:
-       cd htdocs && ln -sf ../uploads
+       cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wikipub:
        cd htdocs && ln -sf ../wiki/pub wikipub
@@ -52,13 +52,13 @@ wiki/local/pmwiki.config.php:
 wiki/pub/skins/empty:
        cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
 
-wiki: build-wiki uploads htdocs/uploads htdocs/wikipub
+wiki: build-wiki spool/uploads htdocs/uploads htdocs/wikipub
        @test -d wiki || wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz
 
-wiki.d::
-       cd $@ && ln -s ../install.d/wiki/wiki.d/* .
+spool/wiki.d::
+       cd $@ && ln -s ../../install.d/wiki/wiki.d/* .
 
-build-wiki: wiki/local/pmwiki.config.php wiki/pub/skins/empty wiki.d
+build-wiki: wiki/local/pmwiki.config.php wiki/pub/skins/empty spool/wiki.d
 
 ################################################################################
 

diff --git a/include/platal/page.inc.php b/include/platal/page.inc.php
index 0e54af0..2aacf3d 100644 (file)
--- a/include/platal/page.inc.php
+++ b/include/platal/page.inc.php
@@ -46,7 +46,7 @@ class PlatalPage extends DiogenesCorePage
         global $globals;
 
         $this->template_dir  = $globals->spoolroot."/templates/";
-        $this->compile_dir   = $globals->spoolroot."/templates_c/";
+        $this->compile_dir   = $globals->spoolroot."/spool/templates_c/";
         array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/");
         $this->config_dir    = $globals->spoolroot."/configs/";
 

diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php
index eaa630e..10e9746 100644 (file)
--- a/plugins/pmwiki.config.php
+++ b/plugins/pmwiki.config.php
@@ -13,8 +13,8 @@
 ##  $PubDirUrl is the URL for the pub directory.
 $ScriptUrl = $globals->baseurl;
 $UploadUrlFmt = $ScriptUrl."/uploads";
-$WorkDir = '../wiki.d';
-$WikiDir = new PageStore('$FarmD/../wiki.d/$FullName');
+$WorkDir = '../spool/wiki.d';
+$WikiDir = new PageStore('$FarmD/../spool/wiki.d/$FullName');
 $PubDirUrl = $globals->baseurl.'/pubwiki';
 $InterMapFiles[] = $globals->spoolroot.'plugins/pmwiki.intermap.txt';