Index: branches/dev/html/install/index.php
===================================================================
--- branches/dev/html/install/index.php	(revision 12154)
+++ branches/dev/html/install/index.php	(revision 12176)
@@ -588,4 +588,10 @@
 		$install_dir = realpath(dirname( __FILE__) . "/../") . "/";
 	}
+    
+	if(defined('DATA_PATH')) {
+		$data_dir = DATA_PATH;
+	} else {
+		$data_dir = realpath(dirname( __FILE__) . "/../../data") . "/";
+	}
 	
 	if(defined('SITE_URL')) {
@@ -619,4 +625,5 @@
 	$objWebParam->addParam("´ÉÍý¼Ô¡§¥Ñ¥¹¥ï¡¼¥É", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK","EXIST_CHECK", "ALNUM_CHECK"));
 	$objWebParam->addParam("¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê", "install_dir", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $install_dir);
+	$objWebParam->addParam("data¥Ç¥£¥ì¥¯¥È¥ê", "data_dir", MTEXT_LEN, "", array("EXIST_CHECK","MAX_LENGTH_CHECK"), $data_dir);
 	$objWebParam->addParam("URL(Ä̾ï)", "normal_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $normal_url);
 	$objWebParam->addParam("URL(¥»¥­¥å¥¢)", "secure_url", MTEXT_LEN, "", array("EXIST_CHECK","URL_CHECK","MAX_LENGTH_CHECK"), $secure_url);
@@ -791,6 +798,6 @@
 	$url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
 	
-	$data_path = $root_dir . "../data/";
-	$filepath = $data_path . "install.inc";
+	//$data_path = $root_dir . "../data/";
+	//$filepath = $data_path . "install.inc";
 	
 	$config_data = 
@@ -808,5 +815,5 @@
 	"    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
 	"    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
-	"    define ('DATA_PATH', '".$data_path."');\n" .
+	//"    define ('DATA_PATH', '".$data_path."');\n" .
     "	 define ('MOBILE_HTML_PATH', HTML_PATH . 'mobile/');\n" .
     "	 define ('MOBILE_SITE_URL', SITE_URL . 'mobile/');\n" .
Index: branches/dev/html/install/templates/step1.tpl
===================================================================
--- branches/dev/html/install/templates/step1.tpl	(revision 17)
+++ branches/dev/html/install/templates/step1.tpl	(revision 12176)
@@ -71,4 +71,12 @@
 		</tr>
 		<tr>
+			<td bgcolor="#f2f1ec" width="150" class="fs12n">DATA¥Ñ¥¹<span class="red">¢¨</span></td>
+			<td bgcolor="#ffffff" width="332" class="fs12">
+			<!--{assign var=key value="data_dir"}-->
+			<span class="red"><!--{$arrErr[$key]}--></span>
+			<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box40" />
+			</td>
+		</tr>
+		<tr>
 			<td bgcolor="#f2f1ec" width="150" class="fs12n">URL(Ä̾ï)<span class="red">¢¨</span></td>
 			<td bgcolor="#ffffff" width="332" class="fs12">