VPATH update for gr-trellis

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3220 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index cc8fe3893b9fd20c218caa5c06caf5935ad6ecdb..52e677a10f0965d132a35c36ec8822e6a3f774db 100644 (file)
--- 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 103a9a26069327091e694dcce3a9384e48134603..30a40a573d7bff54bfc2123437b49a18c1468f09 100644 (file)
--- 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