From d20d04352322c660947d4bf8ea98381da7cfdaa5 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 29 Jan 2013 03:31:14 +0000
Subject: [PATCH]  * move the phpmyadmin.php to windows directory.

---
 build/linux/buildxmapp.sh               | 15 +++++++--------
 build/linux/httpd.conf                  |  6 +++---
 build/{linux => windows}/phpmyadmin.php |  0
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename build/{linux => windows}/phpmyadmin.php (100%)

diff --git a/build/linux/buildxmapp.sh b/build/linux/buildxmapp.sh
index 4a79058f4b..b803d3387d 100755
--- a/build/linux/buildxmapp.sh
+++ b/build/linux/buildxmapp.sh
@@ -222,14 +222,13 @@ echo 'use "../bin/htpasswd -b users username password" to add a new user.' > aut
 
 # process the phpmyadmin
 7z x $1/phpmyadmin.7z
-mkdir admin
-mv phpMyAdmin-3.5.5-all-languages admin/phpmyadmin
-mv admin/phpmyadmin/locale admin/phpmyadmin/locale.bak
-mkdir admin/phpmyadmin/locale
-mv admin/phpmyadmin/locale.bak/en_GB admin/phpmyadmin/locale
-mv admin/phpmyadmin/locale.bak/zh_* admin/phpmyadmin/locale
-rm -fr admin/phpmyadmin/locale.bak
-cp ../phpmyadmin.php admin/phpmyadmin/config.inc.php
+mv phpMyAdmin-3.5.5-all-languages phpmyadmin
+mv phpmylocale phpmylocale.bak
+mkdir phpmylocale
+mv phpmylocale.bak/en_GB phpmylocale
+mv phpmylocale.bak/zh_* phpmylocale
+rm -fr phpmylocale.bak
+cp ../windows/phpmyadmin.php phpmyconfig.inc.php
 
 # copy the ioncube loader.
 cp ../ioncube_loader_lin_5.4.so lib/php/extensions/no-debug-non-zts-20100525/
diff --git a/build/linux/httpd.conf b/build/linux/httpd.conf
index 3d1e78f230..99d797fa9b 100644
--- a/build/linux/httpd.conf
+++ b/build/linux/httpd.conf
@@ -58,7 +58,7 @@ LoadModule php5_module modules/libphp5.so
 AddType application/x-httpd-php .php .php3 .php4
 
 # directory settings.
-DirectoryIndex index.html index.php
+DirectoryIndex index.html index.htm index.php 
 <Directory />
     AllowOverride none
     Require all denied
@@ -96,8 +96,8 @@ Alias /zentao "/opt/lampp/zentao/www/"
 </Directory>
 
 # setting for admin
-Alias /phpmyadmin "/opt/lampp/admin/phpmyadmin"
-<Directory "/opt/lampp/admin/phpmyadmin">
+Alias /phpmyadmin "/opt/lampp/phpmyadmin"
+<Directory "/opt/lampp/phpmyadmin">
   AuthName 'zentao admin(see /opt/lampp/auth/readme)'
   AuthType Basic
   AuthUserFile /opt/lampp/auth/users
diff --git a/build/linux/phpmyadmin.php b/build/windows/phpmyadmin.php
similarity index 100%
rename from build/linux/phpmyadmin.php
rename to build/windows/phpmyadmin.php