Fix for ticket:133, merged from eb/bsd 4322:4324.

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

diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 7eb519d02b63cbc7a72fa7930c0005653ce61f63..32be27044a93567fa7f771496e6c2a152995b320 100644 (file)
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -69,7 +69,7 @@ include Makefile.gen
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py
+       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)

diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am
index a338e39b751da4d7ea848a6c7c521c91cfa8c016..d3fa84cf423ca9c756e17842572629fa6ca19891 100644 (file)
--- a/gnuradio-core/src/lib/gengen/Makefile.am
+++ b/gnuradio-core/src/lib/gengen/Makefile.am
@@ -92,7 +92,7 @@ include Makefile.gen
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py
+       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 6bb2ca819bc07c38ef71a91ce20f10895d9ae876..ed141902827de4bb6df994a479e334436904e03e 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -268,7 +268,7 @@ gnuradio_swig_py_io.cc : sw_io.i
 # FIXME As of swig 1.3.31, this still seems to be required...
 
 gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc $(srcdir)/gen-swig-bug-fix
-       $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
+       $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
 
 # ----------------------------------------------------------------
 

diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am
index 60f889c4b45af1bb574496ce0ced0a65c51775a6..837068c55f9a132357d9bcf23af11feb174dc837 100644 (file)
--- a/pmt/src/lib/Makefile.am
+++ b/pmt/src/lib/Makefile.am
@@ -46,7 +46,7 @@ GENERATED_CC =                                \
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/pmt/src/lib srcdir=$(srcdir) $(srcdir)/generate_unv.py
+       PYTHONPATH=$(top_srcdir)/pmt/src/lib srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_unv.py
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_CC)
 

diff --git a/run_tests.sh.in b/run_tests.sh.in
index 4e7d69e47d0299eec8c09e7a491e7ce5f7a04036..faec6d1667b6b0b38bcba63c16603d57fc2788e1 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -47,7 +47,7 @@ export GR_DONT_LOAD_PREFS
 ok=yes
 for file in $3/qa_*.py
 do
-  if ! $file
+  if ! @PYTHON@ $file
   then
     ok=no
   fi  

diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am
index 7214820b99d0234f99f28ccb5a7212e05f94fb0f..f0b082dfcc97e49d3f03edf9c124579ee021cb6d 100644 (file)
--- a/usrp/firmware/include/Makefile.am
+++ b/usrp/firmware/include/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST =                  \
        $(CODE_GENERATOR)
 
 fpga_regs_common.v: fpga_regs_common.h generate_regs.py 
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_common.h $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_common.h $@
 
 fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_standard.h $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_standard.h $@

diff --git a/usrp/firmware/src/common/Makefile.am b/usrp/firmware/src/common/Makefile.am
index b62baf599bb3d9a94e85c98815426ef430dbbcb3..701bc48c8e6041813a6eff2f4fa7cde0d9fb1474 100644 (file)
--- a/usrp/firmware/src/common/Makefile.am
+++ b/usrp/firmware/src/common/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST =                  \
 all: usrp_gpif.c
 
 usrp_gpif.c usrp_gpif_inline.h : gpif.c
-       srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
+       srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
 
 CLEANFILES = \
        *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \

diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
index cd81a89c7d14f5166f6b9420587f9b4d4ddd78fc..de7164b4b0ede181e5bb36458c975060771c9d92 100644 (file)
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ b/usrp/firmware/src/usrp2/Makefile.am
@@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
        $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
+       $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
        chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
+       $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
        chmod +x $@
 
 
@@ -159,7 +159,7 @@ DISTCLEANFILES =    \
 all: usrp_gpif.c
 
 usrp_gpif.c usrp_gpif_inline.h : gpif.c
-       srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
+       srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
 
 
 # dependencies

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index be4b4e7faca3a47cc623968ef65002774cecabca..83f2984e7795420935d4d80e7d1a2a084273ca98 100644 (file)
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -146,7 +146,7 @@ noinst_PYTHON =                             \
        dump_data.py
 
 usrp_dbid.py usrp_dbid.h usrp_dbid.cc: gen_usrp_dbid.py usrp_dbid.dat
-       PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
+       PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc