Permalink
Browse files

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
  • Loading branch information...
1 parent 16a1911 commit 1ea5ee0b22f275aa65f9b0f657f01942f11b3524 @janl janl committed May 22, 2010
Showing with 6 additions and 4 deletions.
  1. +2 −0 THANKS
  2. +2 −2 bin/couchdb.tpl.in
  3. +1 −1 src/couchdb/Makefile.am
  4. +1 −1 src/couchdb/couch.app.tpl.in
View
2 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.
View
@@ -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
}
View
@@ -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" \
@@ -26,4 +26,4 @@
]}},
{applications, [kernel, stdlib]},
{included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb]}
-]}.
+]}.

0 comments on commit 1ea5ee0

Please sign in to comment.