9 files changed, 12 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 7eb519d02b..32be27044a 100644
--- 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 a338e39b75..d3fa84cf42 100644
--- 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 6bb2ca819b..ed14190282 100644
--- 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 60f889c4b4..837068c55f 100644
--- 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 4e7d69e47d..faec6d1667 100644
--- 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 7214820b99..f0b082dfcc 100644
--- 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 b62baf599b..701bc48c8e 100644
--- 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 cd81a89c7d..de7164b4b0 100644
--- 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 be4b4e7fac..83f2984e77 100644
--- 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