4 files changed, 7 insertions, 7 deletions
diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am
index 6cf829fa7a..03357ccb32 100644
--- a/sca-cpp/trunk/components/nosqldb/Makefile.am
+++ b/sca-cpp/trunk/components/nosqldb/Makefile.am
@@ -30,12 +30,12 @@ tinycdb.prefix: $(top_builddir)/config.status
 EXTRA_DIST = nosqldb.composite nosqldb.componentType
 
 comp_LTLIBRARIES = libnosqldb.la
-noinst_DATA = libnosqldb.so
+noinst_DATA = libnosqldb${libsuffix}
 
 libnosqldb_la_SOURCES = nosqldb.cpp
 libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
-libnosqldb.so:
-	ln -s .libs/libnosqldb.so
+libnosqldb${libsuffix}:
+	ln -s .libs/libnosqldb${libsuffix}
 
 tinycdb_test_SOURCES = tinycdb-test.cpp
 tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb
diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb-test b/sca-cpp/trunk/components/nosqldb/nosqldb-test
index 30c9f89bc9..3730ed67a4 100755
--- a/sca-cpp/trunk/components/nosqldb/nosqldb-test
+++ b/sca-cpp/trunk/components/nosqldb/nosqldb-test
@@ -26,4 +26,4 @@ mkdir -p tmp
 rc=$?
 
 # Cleanup
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/components/nosqldb/server-test b/sca-cpp/trunk/components/nosqldb/server-test
index 5a5d792a32..39b76b1fcd 100755
--- a/sca-cpp/trunk/components/nosqldb/server-test
+++ b/sca-cpp/trunk/components/nosqldb/server-test
@@ -31,10 +31,10 @@ EOF
 sleep 2
 
 # Test
-./client-test 2>/dev/null
+./client-test #2>/dev/null
 rc=$?
 
 # Cleanup
 ../../modules/http/httpd-stop tmp
 sleep 2
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb b/sca-cpp/trunk/components/nosqldb/tinycdb
index 68459d7622..3e5c23957f 100755
--- a/sca-cpp/trunk/components/nosqldb/tinycdb
+++ b/sca-cpp/trunk/components/nosqldb/tinycdb
@@ -17,7 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 tinycdb_prefix=`cat $here/tinycdb.prefix`
 
 $tinycdb_prefix/bin/cdb $*