dynamically adapt to the installed python version

build/config-linux-debug.py

@@ -1,3 +1,5 @@
+import os
+
 BUILDDIR       = '#build/debug'
 DISTDIR        = '#dist'
 CXX            = 'g++'
@@ -16,7 +18,13 @@ XERCESLIB      = ['xerces-c']
 GLLIB          = ['GL', 'GLU', 'GLEWmx', 'Xxf86vm', 'X11']
 GLFLAGS        = ['-DGLEW_MX']
 BOOSTLIB       = ['boost_system', 'boost_filesystem']
-PYTHONINCLUDE  = ['/usr/include/python2.6']
-PYTHONLIB      = ['python2.6', 'boost_python']
 COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
 COLLADALIB     = ['collada14dom']
+PYTHONINCLUDE  = []
+PYTHONLIB      = ['boost_python']
+
+for entry in os.popen("pkg-config --cflags --libs python").read().split():
+	if entry[:2] == '-I':
+		PYTHONINCLUDE += [entry[2:]]
+	if entry[:2] == '-l':
+		PYTHONLIB += [entry[2:]]

build/config-linux.py

@@ -1,3 +1,5 @@
+import os
+
 BUILDDIR       = '#build/release'
 DISTDIR        = '#dist'
 CXX            = 'g++'
@@ -16,7 +18,13 @@ XERCESLIB      = ['xerces-c']
 GLLIB          = ['GL', 'GLU', 'GLEWmx', 'Xxf86vm', 'X11']
 GLFLAGS        = ['-DGLEW_MX']
 BOOSTLIB       = ['boost_system', 'boost_filesystem']
-PYTHONINCLUDE  = ['/usr/include/python2.6']
-PYTHONLIB      = ['python2.6', 'boost_python']
 COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
 COLLADALIB     = ['collada14dom']
+PYTHONINCLUDE  = []
+PYTHONLIB      = ['boost_python']
+
+for entry in os.popen("pkg-config --cflags --libs python").read().split():
+	if entry[:2] == '-I':
+		PYTHONINCLUDE += [entry[2:]]
+	if entry[:2] == '-l':
+		PYTHONLIB += [entry[2:]]

data/linux/debian/mitsuba.install.template

@@ -6,7 +6,7 @@ dist/mtsimport /usr/bin
 dist/libmitsuba-hw.so /usr/lib
 dist/libmitsuba-render.so /usr/lib
 dist/libmitsuba-core.so /usr/lib
-dist/python/mitsuba.so /usr/lib/pyshared/python2.7
+dist/python/mitsuba.so /usr/lib/pyshared/PYTHONVERSION
 dist/plugins/* /usr/share/mitsuba/plugins
 dist/data/* /usr/share/mitsuba/data
 src/qtgui/resources/mitsuba48.png /usr/share/pixmaps

data/linux/debian/rules

@@ -28,6 +28,7 @@ binary-arch:
 	scons -j 2
 	dh_installdirs
 	dh_auto_install
+	cat debian/mitsuba.install.template | sed -e s/PYTHONVERSION/`pkg-config --modversion python`/ > debian/mitsuba.install
 	dh_install
 	dh_installmenu
 	dh_compress