diff --git a/configure.ac b/configure.ac
index 2857b74e..84e76133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,11 +328,13 @@ AC_ARG_ENABLE(python,
 [if [[ "$enableval" = "yes" ]]; then
         PYTHON_PRJ=ocarina-python.gpr
         PYTHON_TARGET=python_tree
+        PYTHON_RUNTIME=python
 fi],
 [])
 
 AC_SUBST(PYTHON_PRJ)
 AC_SUBST(PYTHON_TARGET)
+AC_SUBST(PYTHON_RUNTIME)
 
 ##########################################
 # Some version control stuff
diff --git a/resources/runtime/Makefile.am b/resources/runtime/Makefile.am
index ce24dea1..4bedc037 100644
--- a/resources/runtime/Makefile.am
+++ b/resources/runtime/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cheddar aadl_xml python
+SUBDIRS = cheddar aadl_xml ${PYTHON_RUNTIME}
 
 @DEBUG_FALSE@DEBUG_FLAG = --disable-debug
 @DEBUG_TRUE@DEBUG_FLAG = --enable-debug