wiki : pub dir

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

diff --git a/Makefile b/Makefile
index 1570e14..b31f1d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ htdocs/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
@@ -70,7 +70,7 @@ 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/wikipub
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki
 
 ################################################################################
 

diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php
index aeb0efd..679f481 100644 (file)
--- a/plugins/pmwiki.config.php
+++ b/plugins/pmwiki.config.php
@@ -15,7 +15,7 @@ $ScriptUrl = $globals->baseurl;
 $UploadUrlFmt = $ScriptUrl."/uploads";
 $WorkDir = '../spool/wiki.d';
 $WikiDir = new PageStore('$FarmD/../spool/wiki.d/$FullName');
-$PubDirUrl = $globals->baseurl.'/pubwiki';
+$PubDirUrl = $globals->baseurl.'/wiki';
 $InterMapFiles[] = $globals->spoolroot.'plugins/pmwiki.intermap.txt';
 
 ##  If you want to use URLs of the form .../pmwiki.php/Group/PageName