From 1ea5ee0b22f275aa65f9b0f657f01942f11b3524 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Sat, 22 May 2010 21:46:08 +0000
Subject: Fix Solaris compat. Patch by Gavin Sherry and Timothy Smith. Closes
 COUCHDB-666 \m/

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@947337 13f79535-47bb-0310-9956-ffa450edef68
---
 THANKS                       | 2 ++
 bin/couchdb.tpl.in           | 4 ++--
 src/couchdb/Makefile.am      | 2 +-
 src/couchdb/couch.app.tpl.in | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/THANKS b/THANKS
index 08d00a76..ad5104b7 100644
--- a/THANKS
+++ b/THANKS
@@ -54,5 +54,7 @@ suggesting improvements or submitting changes. Some of these people are:
  * Joscha Feth <joscha@feth.com>
  * Jarrod Roberson <jarrod@vertigrated.com>
  * Jae Kwon <jkwon.work@gmail.com>
+ * Gavin Sherry <swm@alcove.com.au>
+ * Timothy Smith <tim@couch.io>
 
 For a list of authors see the `AUTHORS` file.
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index bdea97fe..686b18b3 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -120,8 +120,8 @@ EOF
 }
 
 _add_config_dir () {
-    for file in `find "$1" -mindepth 1 -maxdepth 1 -type f -name '*.ini'`; do
-        _add_config_file $file
+    for file in "$1"/*.ini; do
+        [ -r "$file" ] && _add_config_file "$file"
     done
 }
 
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index b5c84f33..a5818703 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -179,7 +179,7 @@ couch.app: couch.app.tpl
 	$@ < $<
 else
 couch.app: couch.app.tpl
-	modules=`find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ',' | sed "s/,$$//"`; \
+	modules=`{ find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ','; echo ''; } | sed "s/,$$//"`; \
 	sed -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
 	    -e "s|@modules@|$$modules|g" \
diff --git a/src/couchdb/couch.app.tpl.in b/src/couchdb/couch.app.tpl.in
index fa86d2ec..36b0b34c 100644
--- a/src/couchdb/couch.app.tpl.in
+++ b/src/couchdb/couch.app.tpl.in
@@ -26,4 +26,4 @@
     ]}},
     {applications, [kernel, stdlib]},
     {included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb]}
-]}.
\ No newline at end of file
+]}.
-- 
cgit v1.2.3