From 12689e4fe15f9908d1242b63dd33e149f4db40a8 Mon Sep 17 00:00:00 2001
From: michaelld
Date: Wed, 22 Jul 2009 19:08:18 +0000
Subject: Fix for 'make check' on OSX and Windows; corrects USRP/2 library
 path.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11471 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-usrp/src/run_tests.in  | 4 ++--
 gr-usrp2/src/run_tests.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index f9bdc78b6..c03f96e0b 100644
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -5,11 +5,11 @@
 # 3rd parameter is path to Python QA directory
 
 # For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib:@abs_top_builddir@/usrp/host/lib/.libs:$DYLD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # For Win32
-PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH
+PATH=@abs_top_builddir@/usrp/host/lib:@abs_top_builddir@/usrp/host/lib/.libs:$PATH
 
 @top_builddir@/run_tests.sh \
     @abs_top_srcdir@/gr-usrp \
diff --git a/gr-usrp2/src/run_tests.in b/gr-usrp2/src/run_tests.in
index 99190b81b..3f068256e 100644
--- a/gr-usrp2/src/run_tests.in
+++ b/gr-usrp2/src/run_tests.in
@@ -5,11 +5,11 @@
 # 3rd parameter is path to Python QA directory
 
 # For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp2/host/lib/legacy:@abs_top_builddir@/usrp2/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$DYLD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # For Win32
-PATH=@abs_top_builddir@/usrp2/host/lib/legacy:@abs_top_builddir@/usrp2/host/lib/legacy/.libs:$PATH
+PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$PATH
 
 @top_builddir@/run_tests.sh \
     @abs_top_srcdir@/gr-usrp2 \
-- 
cgit