diff --git a/Makefile b/Makefile
index f1da26b..c5d2dfe 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ $(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir)
 
 iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
 
-UNINSTALL_DIRS += $(TOP)/python
-
 include $(TOP)/configure/RULES_TOP
 
+UNINSTALL_DIRS += $(wildcard $(INSTALL_LOCATION)/python*)
+
 #useful targets includ: doc-html and doc-clean
 doc-%:
 	PYTHONPATH=$$PWD/python $(MAKE) -C documentation $*
diff --git a/configure/CONFIG_PY b/configure/CONFIG_PY
new file mode 100644
index 0000000..eded27c
--- /dev/null
+++ b/configure/CONFIG_PY
@@ -0,0 +1,28 @@
+PYMODULE ?= YES
+
+ifneq ($(T_A),)
+
+include $(TOP)/configure/O.$(T_A)/CONFIG_PY
+ifneq ($(PY_OK),YES)
+$(error Unable to get python configuration)
+endif
+
+USR_CPPFLAGS += $(PY_INCDIRS:%=-I%)
+USR_LDFLAGS += $(PY_LIBDIRS:%=-L%)
+
+ifeq ($(HAVE_NUMPY),YES)
+USR_CPPFLAGS += -DHAVE_NUMPY
+endif
+
+LIB_SYS_LIBS += python$(PY_VER)
+
+PY_INSTALL_DIR = $(INSTALL_LOCATION)/python$(PY_VER)/$(T_A)
+
+# Python loadables have no prefix (eg 'pymod.so')
+# and are installed alongsize .py files
+LOADABLE_SHRLIB_PREFIX =
+ifneq ($(PYMODULE),NO)
+INSTALL_SHRLIB = $(PY_INSTALL_DIR)
+endif
+
+endif
diff --git a/configure/RULES_PY b/configure/RULES_PY
index f1ea75a..c635d51 100644
--- a/configure/RULES_PY
+++ b/configure/RULES_PY
@@ -1,6 +1,8 @@
 ifneq ($(T_A),)
 
-PY_INSTALL_DIR = $(INSTALL_LOCATION)/python/$(T_A)
+ifndef PY_VER
+$(error Must include CONFIG_PY)
+endif
 
 PY_FILES += $(PY:%=$(PY_INSTALL_DIR)/%)
 
diff --git a/devsupApp/src/Makefile b/devsupApp/src/Makefile
index 089d4b1..15086c7 100644
--- a/devsupApp/src/Makefile
+++ b/devsupApp/src/Makefile
@@ -1,24 +1,12 @@
 TOP=../..
 
 include $(TOP)/configure/CONFIG
+PYMODULE = NO
+include $(TOP)/configure/CONFIG_PY
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
 
-ifdef T_A
-include $(TOP)/configure/O.$(T_A)/CONFIG_PY
-ifneq ($(PY_OK),YES)
-$(error Unable to get python configuration)
-endif
-endif
-
-USR_CPPFLAGS += $(PY_INCDIRS:%=-I%)
-USR_LDFLAGS += $(PY_LIBDIRS:%=-L%)
-
-ifeq ($(HAVE_NUMPY),YES)
-USR_CPPFLAGS += -DHAVE_NUMPY
-endif
-
 #=============================
 # Build the IOC application
 
diff --git a/weatherApp/Makefile b/weatherApp/Makefile
index 01fc5af..2425018 100644
--- a/weatherApp/Makefile
+++ b/weatherApp/Makefile
@@ -1,5 +1,6 @@
 TOP=..
 include $(TOP)/configure/CONFIG
+include $(TOP)/configure/CONFIG_PY
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE