summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2010-01-21 08:33:40 -0800
committerJohnathan Corgan2010-01-21 08:33:40 -0800
commit18578e234cf0566ed6196f6dff3920a12a3e2479 (patch)
tree0b78043064185733946062ed0c6212d6ee08931e
parent54c9f6400900d04cddff4926d1de9f5e0467e94d (diff)
parent59d62134500ea938e6ebb0c0279992e07bf59408 (diff)
downloadgnuradio-18578e234cf0566ed6196f6dff3920a12a3e2479.tar.gz
gnuradio-18578e234cf0566ed6196f6dff3920a12a3e2479.tar.bz2
gnuradio-18578e234cf0566ed6196f6dff3920a12a3e2479.zip
Merge branch 'fix/libdir' of git@gnuradio.org:gnuradio
This fix updates the run_tests.sh script with the additional directories in the flattened component layout.
-rw-r--r--run_tests.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.sh.in b/run_tests.sh.in
index 7e1ab9387..ce0d90978 100644
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -13,14 +13,14 @@ abs_top_builddir=@abs_top_builddir@
# current QA srcdir
export srcdir=$3
-# Where to find my swig generated shared library
-mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/swig:$2/swig/.libs
+# Where to find my C++ and swig generated shared libraries
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/lib:$2/lib/.libs:$2/swig:$2/swig/.libs
# Where to find my swig generated python module
mysrcdir=$1/src:$1/src/lib
# Where to find my hand written python modules
-mypydir=$1/src:$1/src/python
+mypydir=$1/src:$1/src/python:$1/python
# Where to find core's swig generated shared libraries,
# and hand generated swig glue