Index: temp/trunk/data/conf/conf.php
===================================================================
--- temp/trunk/data/conf/conf.php	(revision 6086)
+++ temp/trunk/data/conf/conf.php	(revision 6087)
@@ -174,37 +174,37 @@
 
 /* ¥·¥¹¥Æ¥à¥Ñ¥¹ */
-define ("LOG_PATH", ROOT_DIR . "../data/logs/site.log");							// ¥í¥°¥Õ¥¡¥¤¥ë
-define ("CUSTOMER_LOG_PATH", ROOT_DIR . "../data/logs/customer.log");				// ²ñ°÷¥í¥°¥¤¥ó ¥í¥°¥Õ¥¡¥¤¥ë
-define ("TEMPLATE_ADMIN_DIR", ROOT_DIR . "../data/Smarty/templates/admin");		// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
-define ("TEMPLATE_DIR", ROOT_DIR . "../data/Smarty/templates");					// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
-define ("COMPILE_ADMIN_DIR", ROOT_DIR . "../data/Smarty/templates_c/admin");		// SMARTY¥³¥ó¥Ñ¥¤¥ë
-define ("COMPILE_DIR", ROOT_DIR . "../data/Smarty/templates_c");					// SMARTY¥³¥ó¥Ñ¥¤¥ë
-
-define ("TEMPLATE_FTP_DIR", ROOT_DIR . "user_data/templates/");			// SMARTY¥Æ¥ó¥×¥ì¡¼¥È(FTPµö²Ä)
-define ("COMPILE_FTP_DIR", ROOT_DIR . "../data/Smarty/templates_c/user_data/");	// SMARTY¥³¥ó¥Ñ¥¤¥ë
-
-define ("IMAGE_TEMP_DIR", ROOT_DIR . "upload/temp_image/");				// ²èÁü°ì»þÊݸ
-define ("IMAGE_SAVE_DIR", ROOT_DIR . "upload/save_image/");				// ²èÁüÊݸÀè
-define ("IMAGE_TEMP_URL", URL_DIR . "upload/temp_image/");								// ²èÁü°ì»þÊݸURL
-define ("IMAGE_SAVE_URL", URL_DIR . "upload/save_image/");								// ²èÁüÊݸÀèURL
-define ("CSV_TEMP_DIR", ROOT_DIR. "../upload/csv/");							// ¥¨¥ó¥³¡¼¥ÉCSV¤Î°ì»þÊݸÀè
-define ("NO_IMAGE_URL", URL_DIR . "misc/blank.gif");										// ²èÁü¤¬¤Ê¤¤¾ì¹ç¤Ëɽ¼¨
+define ("LOG_PATH", DATA_PATH . "logs/site.log");							// ¥í¥°¥Õ¥¡¥¤¥ë
+define ("CUSTOMER_LOG_PATH", DATA_PATH . "logs/customer.log");				// ²ñ°÷¥í¥°¥¤¥ó ¥í¥°¥Õ¥¡¥¤¥ë
+define ("TEMPLATE_ADMIN_DIR", DATA_PATH . "Smarty/templates/admin");		// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
+define ("TEMPLATE_DIR", DATA_PATH . "Smarty/templates");					// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
+define ("COMPILE_ADMIN_DIR", DATA_PATH . "Smarty/templates_c/admin");		// SMARTY¥³¥ó¥Ñ¥¤¥ë
+define ("COMPILE_DIR", DATA_PATH . "Smarty/templates_c");					// SMARTY¥³¥ó¥Ñ¥¤¥ë
+
+define ("TEMPLATE_FTP_DIR", USER_PATH . "templates/");			// SMARTY¥Æ¥ó¥×¥ì¡¼¥È(FTPµö²Ä)
+define ("COMPILE_FTP_DIR", DATA_PATH . "Smarty/templates_c/user_data/");	// SMARTY¥³¥ó¥Ñ¥¤¥ë
+
+define ("IMAGE_TEMP_DIR", HTML_PATH . "upload/temp_image/");				// ²èÁü°ì»þÊݸ
+define ("IMAGE_SAVE_DIR", HTML_PATH . "upload/save_image/");				// ²èÁüÊݸÀè
+define ("IMAGE_TEMP_URL", URL_DIR . "upload/temp_image/");					// ²èÁü°ì»þÊݸURL
+define ("IMAGE_SAVE_URL", URL_DIR . "upload/save_image/");					// ²èÁüÊݸÀèURL
+define ("CSV_TEMP_DIR", HTML_PATH . "upload/csv/");							// ¥¨¥ó¥³¡¼¥ÉCSV¤Î°ì»þÊݸÀè
+define ("NO_IMAGE_URL", URL_DIR . "misc/blank.gif");						// ²èÁü¤¬¤Ê¤¤¾ì¹ç¤Ëɽ¼¨
 
 /* URL¥Ñ¥¹ */
-define ("URL_SYSTEM_TOP", URL_DIR . "admin/system/index.php");		// ¥·¥¹¥Æ¥à´ÉÍý¥È¥Ã¥×
-define ("URL_CLASS_REGIST", URL_DIR . "admin/products/class.php");	// µ¬³ÊÅÐÏ¿
+define ("URL_SYSTEM_TOP", URL_DIR . "admin/system/index.php");			// ¥·¥¹¥Æ¥à´ÉÍý¥È¥Ã¥×
+define ("URL_CLASS_REGIST", URL_DIR . "admin/products/class.php");		// µ¬³ÊÅÐÏ¿
 define ("URL_INPUT_ZIP", URL_DIR . "input_zip.php");					// ͹ÊØÈÖ¹æÆþÎÏ
-define ("URL_DELIVERY_TOP", URL_DIR . "admin/basis/delivery.php");	// ÇÛÁ÷¶È¼ÔÅÐÏ¿
+define ("URL_DELIVERY_TOP", URL_DIR . "admin/basis/delivery.php");		// ÇÛÁ÷¶È¼ÔÅÐÏ¿
 define ("URL_PAYMENT_TOP", URL_DIR . "admin/basis/payment.php");		// »Ùʧ¤¤ÊýË¡ÅÐÏ¿
 define ("URL_HOME", URL_DIR . "admin/home.php");						// ¥Û¡¼¥à
-define ("URL_LOGIN", URL_DIR . "admin/index.php");					// ¥í¥°¥¤¥ó¥Ú¡¼¥¸
+define ("URL_LOGIN", URL_DIR . "admin/index.php");						// ¥í¥°¥¤¥ó¥Ú¡¼¥¸
 define ("URL_SEARCH_TOP", URL_DIR . "admin/products/index.php");		// ¾¦Éʸ¡º÷¥Ú¡¼¥¸
 define ("URL_ORDER_EDIT", URL_DIR . "admin/order/edit.php");			// ÃíʸÊÔ½¸¥Ú¡¼¥¸
-define ("URL_SEARCH_ORDER", URL_DIR . "admin/order/index.php");		// ÃíʸÊÔ½¸¥Ú¡¼¥¸
+define ("URL_SEARCH_ORDER", URL_DIR . "admin/order/index.php");			// ÃíʸÊÔ½¸¥Ú¡¼¥¸
 define ("URL_ORDER_MAIL", URL_DIR . "admin/order/mail.php");			// ÃíʸÊÔ½¸¥Ú¡¼¥¸
 define ("URL_LOGOUT", URL_DIR . "admin/logout.php");					// ¥í¥°¥¢¥¦¥È¥Ú¡¼¥¸
-define ("URL_SYSTEM_CSV", URL_DIR . "admin/system/member_csv.php");	// ¥·¥¹¥Æ¥à´ÉÍýCSV½ÐÎÏ¥Ú¡¼¥¸
-define ("URL_SYSTEM_TOP", URL_DIR . "admin/system/index.php");		// ¥·¥¹¥Æ¥à´ÉÍýTOP¥Ú¡¼¥¸
-define ("URL_ADMIN_CSS", URL_DIR . "admin/css/");					// ´ÉÍý¥Ú¡¼¥¸ÍÑCSSÊݴɥǥ£¥ì¥¯¥È¥ê
+define ("URL_SYSTEM_CSV", URL_DIR . "admin/system/member_csv.php");		// ¥·¥¹¥Æ¥à´ÉÍýCSV½ÐÎÏ¥Ú¡¼¥¸
+define ("URL_SYSTEM_TOP", URL_DIR . "admin/system/index.php");			// ¥·¥¹¥Æ¥à´ÉÍýTOP¥Ú¡¼¥¸
+define ("URL_ADMIN_CSS", URL_DIR . "admin/css/");						// ´ÉÍý¥Ú¡¼¥¸ÍÑCSSÊݴɥǥ£¥ì¥¯¥È¥ê
 
 /* ǧ¾Ú¥¨¥é¡¼ */
Index: temp/trunk/data/lib/slib.php
===================================================================
--- temp/trunk/data/lib/slib.php	(revision 6022)
+++ temp/trunk/data/lib/slib.php	(revision 6087)
@@ -60,11 +60,11 @@
 		}	
 	} else {
-		$path = ROOT_DIR . "html/install/index.php";
+		$path = HTML_PATH . "install/index.php";
 		if(file_exists($path)) {
 			sfErrorHeader(">> /install/index.php¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë´°Î»¸å¤Ë¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£");
 		}
 		
-		// install.inc¤Î¥Á¥§¥Ã¥¯
-		$path = ROOT_DIR . "html/install.inc";
+		// µì¥Ð¡¼¥¸¥ç¥ó¤Îinstall.inc¤Î¥Á¥§¥Ã¥¯
+		$path = HTML_PATH . "install.inc";
 		if(file_exists($path)) {
 			sfErrorHeader(">> /install.inc¤Ï¥»¥­¥å¥ê¥Æ¥£¡¼¥Û¡¼¥ë¤È¤Ê¤ê¤Þ¤¹¡£ºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£");