diff --git a/configure.ac b/configure.ac index b972805..1fe4bdf 100644 --- a/configure.ac (revision 34e56d12931a25222d7debb22f95bb2f9fa696a0) +++ b/configure.ac (revision 49d37f0cc7121a8386e4a8f21e5e0f7b614922b1) @@ -60,5 +60,5 @@ PYTHONVERS= else - PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) + PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([[^/]]*\)/Python.h|\1|g' | tr '\n' ' ') AC_MSG_RESULT([$PYTHONVERS]) fi diff --git a/Makefile.in b/Makefile.in index a448c5f..f9bbe1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,11 +79,11 @@ showkey: showkey.o $(LIBNEWT) _snackmodule.so: snackmodule.c $(LIBNEWTSH) [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ mkdir -p $$ver ;\ - PCFLAGS=`$$ver-config --cflags`; \ - PIFLAGS=`$$ver-config --includes`; \ - PLDFLAGS=`$$ver-config --ldflags`; \ - PLFLAGS=`$$ver-config --libs`; \ - $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ + PCFLAGS=`python-config-$${ver#python} --cflags`; \ + PIFLAGS=`python-config-$${ver#python} --includes`; \ + PLDFLAGS=`python-config-$${ver#python} --ldflags`; \ + PLFLAGS=`python-config-$${ver#python} --libs`; \ + $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -fPIC -o $$ver/snackmodule.o snackmodule.c ;\ $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\ done || : touch $@