couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r667976 - in /incubator/couchdb/trunk/bin: Makefile.am couchdb.tpl.in
Date Sun, 15 Jun 2008 17:14:31 GMT
Author: nslater
Date: Sun Jun 15 10:14:30 2008
New Revision: 667976

URL: http://svn.apache.org/viewvc?rev=667976&view=rev
Log:
use awk found from configure

Modified:
    incubator/couchdb/trunk/bin/Makefile.am
    incubator/couchdb/trunk/bin/couchdb.tpl.in

Modified: incubator/couchdb/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/Makefile.am?rev=667976&r1=667975&r2=667976&view=diff
==============================================================================
--- incubator/couchdb/trunk/bin/Makefile.am (original)
+++ incubator/couchdb/trunk/bin/Makefile.am Sun Jun 15 10:14:30 2008
@@ -25,6 +25,7 @@
 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" \

Modified: incubator/couchdb/trunk/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/couchdb.tpl.in?rev=667976&r1=667975&r2=667976&view=diff
==============================================================================
--- incubator/couchdb/trunk/bin/couchdb.tpl.in (original)
+++ incubator/couchdb/trunk/bin/couchdb.tpl.in Sun Jun 15 10:14:30 2008
@@ -105,11 +105,11 @@
 _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



Mime
View raw message