2 files changed, 12 insertions, 12 deletions
diff --git a/sca-cpp/trunk/components/http/Makefile.am b/sca-cpp/trunk/components/http/Makefile.am
index 43e125682e..8b97f2e16d 100644
--- a/sca-cpp/trunk/components/http/Makefile.am
+++ b/sca-cpp/trunk/components/http/Makefile.am
@@ -20,32 +20,32 @@ compdir=$(prefix)/components/http
 EXTRA_DIST = http.composite httpget.componentType httpdelete.componentType *.scm
 
 comp_LTLIBRARIES = libhttpget.la libhttpdelete.la libhttppost.la libhttpput.la libhttppatch.la
-noinst_DATA = libhttpget.so libhttpdelete.so libhttppost.so libhttpput.so libhttppatch.so
+noinst_DATA = libhttpget${libsuffix} libhttpdelete${libsuffix} libhttppost${libsuffix} libhttpput${libsuffix} libhttppatch${libsuffix}
 
 libhttpget_la_SOURCES = httpget.cpp
 libhttpget_la_LDFLAGS = -lxml2 -lmozjs -curl
-libhttpget.so:
-	ln -s .libs/libhttpget.so
+libhttpget${libsuffix}:
+	ln -s .libs/libhttpget${libsuffix}
 
 libhttpdelete_la_SOURCES = httpdelete.cpp
 libhttpdelete_la_LDFLAGS = -lxml2 -lmozjs -curl
-libhttpdelete.so:
-	ln -s .libs/libhttpdelete.so
+libhttpdelete${libsuffix}:
+	ln -s .libs/libhttpdelete${libsuffix}
 
 libhttppost_la_SOURCES = httppost.cpp
 libhttppost_la_LDFLAGS = -lxml2 -lmozjs -curl
-libhttppost.so:
-	ln -s .libs/libhttppost.so
+libhttppost${libsuffix}:
+	ln -s .libs/libhttppost${libsuffix}
 
 libhttpput_la_SOURCES = httpput.cpp
 libhttpput_la_LDFLAGS = -lxml2 -lmozjs -curl
-libhttpput.so:
-	ln -s .libs/libhttpput.so
+libhttpput${libsuffix}:
+	ln -s .libs/libhttpput${libsuffix}
 
 libhttppatch_la_SOURCES = httppatch.cpp
 libhttppatch_la_LDFLAGS = -lxml2 -lmozjs -curl
-libhttppatch.so:
-	ln -s .libs/libhttppatch.so
+libhttppatch${libsuffix}:
+	ln -s .libs/libhttppatch${libsuffix}
 
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
diff --git a/sca-cpp/trunk/components/http/server-test b/sca-cpp/trunk/components/http/server-test
index edfeb5d189..1deb46aa26 100755
--- a/sca-cpp/trunk/components/http/server-test
+++ b/sca-cpp/trunk/components/http/server-test
@@ -36,4 +36,4 @@ rc=$?
 # Cleanup
 ../../modules/http/httpd-stop tmp
 sleep 2
-return $rc
+exit $rc