summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-07 16:46:46 +0000
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-07 16:46:46 +0000
commit4dc777af1a2c40bccd1894f58d4988bd642951a3 (patch)
treec428e0fc4d2bed8bade9254c78341fb24c035c55
parente9a821632def12c450110e164d0d1c0275d41946 (diff)
VPATH update for gr-trellis
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3220 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gr-trellis/src/lib/Makefile.am2
-rw-r--r--gr-trellis/src/python/run_tests.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index cc8fe3893b..52e677a10f 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -39,7 +39,7 @@ ALL_IFILES = \
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES = \
diff --git a/gr-trellis/src/python/run_tests.in b/gr-trellis/src/python/run_tests.in
index 103a9a2606..30a40a573d 100644
--- a/gr-trellis/src/python/run_tests.in
+++ b/gr-trellis/src/python/run_tests.in
@@ -18,7 +18,9 @@ libsrc=@abs_top_srcdir@/gr-trellis/src/lib
py=@abs_top_srcdir@/gr-trellis/src/python
# Where to look for GNU Radio python modules in current build tree
-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
+grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH