Index: branches/rel/html/install/index.php
===================================================================
--- branches/rel/html/install/index.php	(revision 12157)
+++ branches/rel/html/install/index.php	(revision 12317)
@@ -7,5 +7,5 @@
 require_once("../require.php");
 $INSTALL_DIR = realpath(dirname( __FILE__));
-require_once("../../data/module/Request.php");
+require_once("../" . HTML2DATA_DIR . "module/Request.php");
 
 define("INSTALL_LOG", "./temp/install.log");
@@ -366,11 +366,11 @@
 	// ¥×¥í¥°¥é¥à¤Ç½ñ¹þ¤ß¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥ì¥¯¥È¥ê
 	$arrWriteFile = array(
-		"../../data/install.inc",
+		".." . HTML2DATA_DIR . "install.php",
 		"../user_data",
 		"../cp",
 		"../upload",
-		"../../data/Smarty/templates_c",
-		"../../data/downloads",
-		"../../data/logs"
+		".." . HTML2DATA_DIR . "Smarty/templates_c",
+		".." . HTML2DATA_DIR . "downloads",
+		".." . HTML2DATA_DIR . "logs"
 	);
 	
@@ -406,5 +406,5 @@
 	// ¸¢¸Â¥¨¥é¡¼Åù¤¬È¯À¸¤·¤Æ¤¤¤Ê¤¤¾ì¹ç
 	if(!$err_file) {
-		$path = "../../data/Smarty/templates_c/admin";
+		$path = ".." . HTML2DATA_DIR . "Smarty/templates_c/admin";
 		if(!file_exists($path)) {
 			mkdir($path);
@@ -434,9 +434,9 @@
 			mkdir($path);
 		}
-		$path = "../../data/downloads/module";
+		$path = ".." . HTML2DATA_DIR . "downloads/module";
 		if(!file_exists($path)) {
 			mkdir($path);
 		}
-		$path = "../../data/downloads/update";
+		$path = ".." . HTML2DATA_DIR . "downloads/update";
 		if(!file_exists($path)) {
 			mkdir($path);
@@ -791,6 +791,11 @@
 	$url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
 	
-	$data_path = $root_dir . "../data/";
-	$filepath = $data_path . "install.inc";
+	$data_path = sfRmDupSlash($root_dir . HTML2DATA_DIR);
+    $data_path = realpath($data_path);
+    // ¸ìÈø¤Ë'/'¤ò¤Ä¤±¤ë
+	if (!ereg("/$", $data_path)) {
+		$data_path = $data_path . "/";
+	}
+	$filepath = $data_path . "install.php";
 	
 	$config_data = 
@@ -809,8 +814,8 @@
 	"    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
 	"    define ('DATA_PATH', '".$data_path."');\n" .
-    "	 define ('MOBILE_HTML_PATH', HTML_PATH . 'mobile/');\n" .
-    "	 define ('MOBILE_SITE_URL', SITE_URL . 'mobile/');\n" .
-    "	 define ('MOBILE_SSL_URL', SSL_URL . 'mobile/');\n" .
-    "	 define ('MOBILE_URL_DIR', URL_DIR . 'mobile/');\n" .
+    "    define ('MOBILE_HTML_PATH', HTML_PATH . 'mobile/');\n" .
+    "    define ('MOBILE_SITE_URL', SITE_URL . 'mobile/');\n" .
+    "    define ('MOBILE_SSL_URL', SSL_URL . 'mobile/');\n" .
+    "    define ('MOBILE_URL_DIR', URL_DIR . 'mobile/');\n" .
 	"?>";