From 8be2d186f8ec779ddf867f3aa77421bf71fbca4f Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.(none)>
Date: Mon, 24 Jul 2006 15:56:11 +0100
Subject: [PATCH] Minor fixes to build system to make tests work.

---
 skel/src/clib/build.lib   | 6 +++++-
 skel/src/cpplib/build.lib | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/skel/src/clib/build.lib b/skel/src/clib/build.lib
index b2ca416..ee0df40 100644
--- a/skel/src/clib/build.lib
+++ b/skel/src/clib/build.lib
@@ -29,10 +29,14 @@ then
     then
         echo " Compiling"
 
+        SONAME="${LIB_BASE}.so.${SOMAJOR}.${SOMINOR}"
         do_cmd ${CC} ${CFLAGS} -shared -fpic -o "${LIB}" \
-            -Wl,-soname,${LIB_BASE}.so.${SOMAJOR}.${SOMINOR} \
+            -Wl,-soname,${SONAME} \
             ${SRC} ${SO_LIBS} || return 1
 
+        # make tests work
+        do_cmd ln -sf $(basename ${LIB}) obj/${SONAME} || return 1
+
         print_success "Library built"
     else
         print_success "Library up to date"
diff --git a/skel/src/cpplib/build.lib b/skel/src/cpplib/build.lib
index 4a9f86b..2f357e0 100644
--- a/skel/src/cpplib/build.lib
+++ b/skel/src/cpplib/build.lib
@@ -29,10 +29,14 @@ then
     then
         echo " Compiling"
 
+        SONAME="${LIB_BASE}.so.${SOMAJOR}.${SOMINOR}"
         do_cmd ${CXX} ${CFLAGS} -shared -fpic -o "${LIB}" \
-            -Wl,-soname,${LIB_BASE}.so.${SOMAJOR}.${SOMINOR} \
+            -Wl,-soname,${SONAME} \
             ${SRC} ${SO_LIBS} || return 1
 
+        # make tests work
+        do_cmd ln -sf $(basename ${LIB}) obj/${SONAME} || return 1
+
         print_success "Library built"
     else
         print_success "Library up to date"