diff options
| author | Noah Slater <nslater@apache.org> | 2008-06-15 17:14:30 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2008-06-15 17:14:30 +0000 |
| commit | 65038be103be4b9a82cad8a3c5dbea29d2e70b26 (patch) | |
| tree | 28d59edb0b21c5ccec246a4e6e76bab4e461b3f0 | |
| parent | 5d6be4a5424b7b4b860a955efe453b306817fe0d (diff) | |
use awk found from configure
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@667976 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | bin/Makefile.am | 1 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index 437f64fc..92ab95cd 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -25,6 +25,7 @@ couchjs_command_name = `echo couchjs | sed '$(transform)'` couchdb: couchdb.tpl sed -e "s|%ERL%|$(ERL)|g" \ -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \ + -e "s|%AWK%|$(AWK)|g" \ -e "s|%bindir%|@bindir@|g" \ -e "s|%erlangbindir%|@erlangbindir@|g" \ -e "s|%erlanglibdir%|@erlanglibdir@|g" \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 0e23d73c..d62b378e 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -105,11 +105,11 @@ display_error () { _load_configuration () { # Load ini configuration and overwrite default variables. - dbrootdir_ini_value=`awk -F = "/^DbRootDir=/{print \$2}" < $INI_FILE` + dbrootdir_ini_value=`%AWK% -F = "/^DbRootDir=/{print \$2}" < $INI_FILE` if test -n "$dbrootdir_ini_value"; then LIB_DIRECTORY=$dbrootdir_ini_value fi - logfile_ini_value=`awk -F = "/^LogFile=/{print \$2}" < $INI_FILE` + logfile_ini_value=`%AWK% -F = "/^LogFile=/{print \$2}" < $INI_FILE` if test -n "$logfile_ini_value"; then LOG_DIRECTORY=`dirname $logfile_ini_value` fi |