2 files changed, 9 insertions, 9 deletions
diff --git a/sca-cpp/trunk/samples/store-cpp/Makefile.am b/sca-cpp/trunk/samples/store-cpp/Makefile.am
index 1a642e583c..3f9d8e87eb 100644
--- a/sca-cpp/trunk/samples/store-cpp/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cpp/Makefile.am
@@ -22,19 +22,19 @@ sampledir = $(prefix)/samples/store-cpp
 nobase_dist_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*.html
 
 sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
-noinst_DATA = libcurrency-converter.so libfruits-catalog.so libshopping-cart.so
+noinst_DATA = libcurrency-converter${libsuffix} libfruits-catalog${libsuffix} libshopping-cart${libsuffix}
 
 libcurrency_converter_la_SOURCES = currency-converter.cpp
-libcurrency-converter.so:
-	ln -s .libs/libcurrency-converter.so
+libcurrency-converter${libsuffix}:
+	ln -s .libs/libcurrency-converter${libsuffix}
 
 libfruits_catalog_la_SOURCES = fruits-catalog.cpp
-libfruits-catalog.so:
-	ln -s .libs/libfruits-catalog.so
+libfruits-catalog${libsuffix}:
+	ln -s .libs/libfruits-catalog${libsuffix}
 
 libshopping_cart_la_SOURCES = shopping-cart.cpp
-libshopping-cart.so:
-	ln -s .libs/libshopping-cart.so
+libshopping-cart${libsuffix}:
+	ln -s .libs/libshopping-cart${libsuffix}
 
 dist_noinst_SCRIPTS = server-test
 TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-cpp/server-test b/sca-cpp/trunk/samples/store-cpp/server-test
index e0d8716449..e621803f8d 100755
--- a/sca-cpp/trunk/samples/store-cpp/server-test
+++ b/sca-cpp/trunk/samples/store-cpp/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc