ask python for its prefix

diff --git a/support/make/avr/eprb.extra b/support/make/avr/eprb.extra
index 18a910f04841067861771beb2f92ddf63dafc170..c12c9c7a51500b4efbede69699b63ad1c05c392f 100644 (file)
--- a/support/make/avr/eprb.extra
+++ b/support/make/avr/eprb.extra
@@ -20,7 +20,7 @@ endif
 
 ifeq ($(PROGRAMMER),uisp)
     PROGRAMMER_FLAGS = -dprog=stk500 -dhost=$(EPRB)     --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_STK)
-    PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) --verify
+    PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) 
     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER_IMG) --verify
 endif
 

diff --git a/support/make/sim.extra b/support/make/sim.extra
index 10ee519569f113b070ba3aba36605eae26d09223..13ab0516d46dee7b2606a12a51478cb164e2a0bf 100644 (file)
--- a/support/make/sim.extra
+++ b/support/make/sim.extra
@@ -18,7 +18,7 @@ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
 HASHOBJFILE = $(BUILDDIR)/c-support.o
 PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
 PYOBJFILE  = $(BUILDDIR)/pytossim.o
-PYDIR      =/usr/include/python$(PYTHON_VERSION)
+PYDIR      = $(shell python$(PYTHON_VERSION)-config --prefix)/include/python$(PYTHON_VERSION)
 SIMDIR     =$(TOSDIR)/lib/tossim
 XML        = app.xml
 DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags