- Update to 1.1.15.5144

- Use WWWDIR

PR:		114138
Submitted by:	Greg Larkin <glarkin@sourcehosting.net> (maintainer)

5 files changed, 5 insertions, 5 deletions

diff --git a/www/cakephp/files/cakephp-development-cgi.conf.in b/www/cakephp/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-development.conf.in b/www/cakephp/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp/files/cakephp-development.conf.in
+++ b/www/cakephp/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-production-cgi.conf.in b/www/cakephp/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-production.conf.in b/www/cakephp/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp/files/cakephp-production.conf.in
+++ b/www/cakephp/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp/files/pkg-message.in b/www/cakephp/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp/files/pkg-message.in
+++ b/www/cakephp/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.