summaryrefslogtreecommitdiff
path: root/gr-usrp
diff options
context:
space:
mode:
Diffstat (limited to 'gr-usrp')
-rw-r--r--gr-usrp/src/Makefile.am9
-rw-r--r--gr-usrp/src/run_tests.in4
2 files changed, 8 insertions, 5 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 351ac61d9..26b7043a9 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -63,11 +63,14 @@ ourpython_PYTHON = \
INCLUDES = $(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- $(USRP_INCLUDES)
+ $(USRP_INCLUDES) \
+ $(WITH_INCLUDES)
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) \
$(STD_DEFINES_AND_INCLUDES) \
- $(USRP_INCLUDES)
+ $(USRP_INCLUDES) \
+ $(WITH_INCLUDES) \
+ $(WITH_SWIG_INCLUDES)
grinclude_HEADERS = \
usrp1_sink_base.h \
diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index 84ae973f4..f9bdc78b6 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/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
# For Win32
-PATH=@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH
+PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH
@top_builddir@/run_tests.sh \
@abs_top_srcdir@/gr-usrp \