From db1b2f7c85600ffd108bd69a381505e0e7223a8a Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sun, 6 Aug 2006 02:12:07 +0000
Subject: better (read: real) fix for ticket:15
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3179 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-usrp/src/Makefile.am | 5 +----
gr-usrp/src/run_tests.in | 9 +++++----
2 files changed, 6 insertions(+), 8 deletions(-)
(limited to 'gr-usrp/src')
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index ecec8b9f04..611dd604d9 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -60,10 +60,7 @@ ourpython_PYTHON = \
usrp_multi.py
-USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include
-USRP_LIBS = -L$(top_srcdir)/usrp/host/lib -lusrp
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(USRP_INCLUDES)
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(USRP_INCLUDES)
diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index 793cb2491e..39a158ba0b 100644
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -18,11 +18,12 @@ libsrc=@abs_top_srcdir@/gr-usrp/src
py=@abs_top_srcdir@/gr-usrp/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
-grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
+grbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
+# Where to look for USRP lib in current build tree
+usrpbld=@abs_top_builddir@/usrp/host/lib/.libs
+
+PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
export PYTHONPATH
#
--
cgit v1.2.3