- ethnaコマンドのETHNA_HOMEをインストール時に決定するように改善

diff --git a/CHANGES b/CHANGES
index 95c9490..c449ffb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@
 
 *** features
 
+- ethna¥³¥Þ¥ó¥É¤ÎETHNA_HOME¤ò¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë·èÄꤹ¤ë¤è¤¦¤Ë²þÁ±
 - Ethna_ActionForm::validate() ¤Ç¿¼¡¸µÇÛÎó¤¬ÅϤµ¤ì¤¿¤È¤­¤Înotice¤ò²óÈò
 - Ethna_Backend::setActionForm(), Ethna_Backend::setActionClass()¥á¥½¥Ã¥É¤òÄɲÃ
 - Ethna_Filter¤Î¥¹¥±¥ë¥È¥ó¤ËpreActionFilter()/postActionFilter()¤òÄɲÃ

diff --git a/bin/ethna.sh b/bin/ethna.sh
index 0c6247f..8659218 100755 (executable)
--- a/bin/ethna.sh
+++ b/bin/ethna.sh
@@ -9,7 +9,7 @@
 
 if [ -z "$ETHNA_HOME" ];
 then
-    ETHNA_HOME="/usr/local/lib/php/Ethna"
+    ETHNA_HOME="@PEAR-DIR@"
 fi
 
 if (test -z "$PHP_COMMAND");

diff --git a/bin/ethna_make_package.php b/bin/ethna_make_package.php
index d9d4117..037d290 100644 (file)
--- a/bin/ethna_make_package.php
+++ b/bin/ethna_make_package.php
@@ -94,8 +94,10 @@ $packagexml->addMaintainer('lead', 'cocoitiban', 'Keita Arai', 'cocoiti@comio.in
 
 $packagexml->setLicense('The BSD License', 'http://www.opensource.org/licenses/bsd-license.php');
 
-$packagexml->addReplacement('bin/ethna.bat', 'pear-config', '@PHP-BIN@', 'php_bin');
-$packagexml->addReplacement('bin/ethna.sh', 'pear-config', '@PHP-BIN@', 'php_bin');
+$packagexml->addReplacement('bin/ethna.bat', 'pear-config', '@PEAR-DIR@', 'php_dir');
+$packagexml->addReplacement('bin/ethna.bat', 'pear-config', '@PHP-BIN@', 'bin_dir');
+$packagexml->addReplacement('bin/ethna.sh', 'pear-config', '@PEAR-DIR@', 'php_dir');
+$packagexml->addReplacement('bin/ethna.sh', 'pear-config', '@PHP-BIN@', 'bin_dir');
 
 $packagexml->addRelease();
 $packagexml->setOSInstallCondition('windows');