5 files changed, 9 insertions, 9 deletions
diff --git a/sca-cpp/trunk/components/queue/Makefile.am b/sca-cpp/trunk/components/queue/Makefile.am
index f527488a3b..c44722a523 100644
--- a/sca-cpp/trunk/components/queue/Makefile.am
+++ b/sca-cpp/trunk/components/queue/Makefile.am
@@ -32,17 +32,17 @@ qpidc.prefix: $(top_builddir)/config.status
 EXTRA_DIST = queue.composite queue-sender.componentType queue-listener.componentType *.scm
 
 comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
-noinst_DATA = libqueue-sender.so libqueue-listener.so
+noinst_DATA = libqueue-sender${libsuffix} libqueue-listener${libsuffix}
 
 libqueue_sender_la_SOURCES = queue-sender.cpp
 libqueue_sender_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
-libqueue-sender.so:
-	ln -s .libs/libqueue-sender.so
+libqueue-sender${libsuffix}:
+	ln -s .libs/libqueue-sender${libsuffix}
 
 libqueue_listener_la_SOURCES = queue-listener.cpp
 libqueue_listener_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
-libqueue-listener.so:
-	ln -s .libs/libqueue-listener.so
+libqueue-listener${libsuffix}:
+	ln -s .libs/libqueue-listener${libsuffix}
 
 qpid_test_SOURCES = qpid-test.cpp
 qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
diff --git a/sca-cpp/trunk/components/queue/qpidd-start b/sca-cpp/trunk/components/queue/qpidd-start
index 02e048c41e..a65065182c 100755
--- a/sca-cpp/trunk/components/queue/qpidd-start
+++ b/sca-cpp/trunk/components/queue/qpidd-start
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Start qpidd
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 qpid_prefix=`cat $here/qpidc.prefix`
 $qpid_prefix/sbin/qpidd &
diff --git a/sca-cpp/trunk/components/queue/qpidd-stop b/sca-cpp/trunk/components/queue/qpidd-stop
index 3baf2fee27..bb43d8aaba 100755
--- a/sca-cpp/trunk/components/queue/qpidd-stop
+++ b/sca-cpp/trunk/components/queue/qpidd-stop
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Stop qpidd
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 qpid_prefix=`cat $here/qpidc.prefix`
 qpidd="$qpid_prefix/sbin/qpidd"
diff --git a/sca-cpp/trunk/components/queue/send-test b/sca-cpp/trunk/components/queue/send-test
index ec6d9d9083..f2cc53d851 100755
--- a/sca-cpp/trunk/components/queue/send-test
+++ b/sca-cpp/trunk/components/queue/send-test
@@ -28,4 +28,4 @@ rc=$?
 # Cleanup
 ./qpidd-stop
 sleep 1
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/components/queue/server-test b/sca-cpp/trunk/components/queue/server-test
index 571b09082c..1e575c6193 100755
--- a/sca-cpp/trunk/components/queue/server-test
+++ b/sca-cpp/trunk/components/queue/server-test
@@ -40,4 +40,4 @@ rc=$?
 sleep 1
 ./qpidd-stop
 sleep 1
-return $rc
+exit $rc