bye install.d/wiki.

move plugins/pmwiki* into more adequate places too

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

diff --git a/Makefile b/Makefile
index e8abfa6..1a31049 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,17 +65,17 @@ htdocs/wiki:
 spool/wiki.d:
        mkdir -p $@
        chmod o+w $@
-       cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+       cd $@ && ln -sf ../../include/wiki/wiki.d/* .
 
 
 wiki/cookbook/e-protect.php:
-       cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
+       cd wiki/cookbook && ln -sf ../../include/wiki/e-protect.php
 
 wiki/local/farmconfig.php:
-       cd wiki/local/     && ln -sf ../../plugins/pmwiki.config.php farmconfig.php
+       cd wiki/local/ && ln -sf ../../include/wiki/farmconfig.php
 
 wiki/pub/skins/empty:
-       cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
+       cd wiki/pub/skins/ && ln -sf ../../../include/wiki/empty
 
 
 get-wiki:

diff --git a/plugins/pmwiki.intermap.txt b/configs/pmwiki.intermap.txt
similarity index 100%
rename from plugins/pmwiki.intermap.txt
rename to configs/pmwiki.intermap.txt

diff --git a/install.d/wiki/e-protect.php b/include/wiki/e-protect.php
similarity index 100%
rename from install.d/wiki/e-protect.php
rename to include/wiki/e-protect.php

diff --git a/install.d/wiki/empty/empty.tmpl b/include/wiki/empty/empty.tmpl
similarity index 100%
rename from install.d/wiki/empty/empty.tmpl
rename to include/wiki/empty/empty.tmpl

diff --git a/plugins/pmwiki.config.php b/include/wiki/farmconfig.php
similarity index 98%
rename from plugins/pmwiki.config.php
rename to include/wiki/farmconfig.php
index a93ae66..ee13e1a 100644 (file)
--- a/plugins/pmwiki.config.php
+++ b/include/wiki/farmconfig.php
@@ -13,7 +13,7 @@ $PubDirUrl        = './wiki';     #/
 
 $WorkDir          = '../spool/wiki.d';
 $WikiDir          = new PageStore('$FarmD/'.$WorkDir.'/$FullName');
-$InterMapFiles[]  = $globals->spoolroot.'plugins/pmwiki.intermap.txt';
+$InterMapFiles[]  = $globals->spoolroot.'/configs/pmwiki.intermap.txt';
 
 $Skin             = 'empty';
 

diff --git a/install.d/wiki/wiki.d/Site.EditForm b/include/wiki/wiki.d/Site.EditForm
similarity index 100%
rename from install.d/wiki/wiki.d/Site.EditForm
rename to include/wiki/wiki.d/Site.EditForm

diff --git a/install.d/wiki/wiki.d/Site.EditQuickReference b/include/wiki/wiki.d/Site.EditQuickReference
similarity index 100%
rename from install.d/wiki/wiki.d/Site.EditQuickReference
rename to include/wiki/wiki.d/Site.EditQuickReference

diff --git a/install.d/wiki/wiki.d/Site.GroupAttributes b/include/wiki/wiki.d/Site.GroupAttributes
similarity index 100%
rename from install.d/wiki/wiki.d/Site.GroupAttributes
rename to include/wiki/wiki.d/Site.GroupAttributes

diff --git a/install.d/wiki/wiki.d/Site.PageActions b/include/wiki/wiki.d/Site.PageActions
similarity index 100%
rename from install.d/wiki/wiki.d/Site.PageActions
rename to include/wiki/wiki.d/Site.PageActions

diff --git a/install.d/wiki/wiki.d/Site.Preferences b/include/wiki/wiki.d/Site.Preferences
similarity index 100%
rename from install.d/wiki/wiki.d/Site.Preferences
rename to include/wiki/wiki.d/Site.Preferences