--- dokuwiki-rc2008-03-31/inc/init.php	2008-03-31 20:11:17.000000000 +0200
+++ dokuwiki-rc2008-03-31.new/inc/init.php	2008-04-01 09:44:54.001374243 +0200
@@ -14,7 +14,7 @@
   if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
 
   // define config path (packagers may want to change this to /etc/dokuwiki/)
-  if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+  if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
 
   // check for error reporting override or set error reporting to sane values
   if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
--- dokuwiki-rc2008-03-31.new/install.php	2008-04-01 09:44:43.367532550 +0200
+++ dokuwiki-2008-05-05/install.php	2008-05-05 22:20:26.943391311 +0300
@@ -6,8 +6,9 @@
  */
 
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
-if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
-if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
+if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/webapps/dokuwiki/');
+if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_CONF);
+if(!defined('DOKU_DATA')) define('DOKU_DATA','/var/lib/dokuwiki');
 
 // check for error reporting override or set error reporting to sane values
 if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
@@ -389,15 +390,15 @@
 
     $dirs = array(
         'conf'      => DOKU_LOCAL,
-        'data'      => DOKU_INC.'data',
-        'pages'     => DOKU_INC.'data/pages',
-        'attic'     => DOKU_INC.'data/attic',
-        'media'     => DOKU_INC.'data/media',
-        'meta'      => DOKU_INC.'data/meta',
-        'cache'     => DOKU_INC.'data/cache',
-        'locks'     => DOKU_INC.'data/locks',
-        'index'     => DOKU_INC.'data/index',
-        'tmp'       => DOKU_INC.'data/tmp'
+        'data'      => DOKU_DATA,
+        'pages'     => DOKU_DATA.'/pages',
+        'attic'     => DOKU_DATA.'/attic',
+        'media'     => DOKU_DATA.'/media',
+        'meta'      => DOKU_DATA.'/meta',
+        'cache'     => DOKU_DATA.'/cache',
+        'locks'     => DOKU_DATA.'/locks',
+        'index'     => DOKU_DATA.'/index',
+        'tmp'       => DOKU_DATA.'/tmp'
     );
 
     $ok = true;