diff --git a/GNUMakefile b/GNUMakefile
index cbe5739..ccc0424 100644
--- a/GNUMakefile
+++ b/GNUMakefile
@@ -4,6 +4,10 @@ include /ioc/tools/driver.makefile
 MODULE=pyDevSup
 LIBVERSION=koennecke
 BUILDCLASSES=Linux
+ARCH_FILTER=RHEL7-x86_64
+
+#----------- Define python version
+PY=python3.6m
 
 # See README.module for more instructions
 
@@ -15,13 +19,9 @@ SOURCES += devsupApp/src/dbdset.c
 SOURCES += devsupApp/src/dbfield.c
 SOURCES += devsupApp/src/dbrec.c
 SOURCES += devsupApp/src/utest.c
-#SOURCES += devsupApp/src/pyDevSupCommon_registerRecordDeviceDriver.cpp
 
-
-USR_CFLAGS += -I/usr/include/python3.6m -DHAVE_NUMPY 
-USR_CFLAGS += -DXEPICS_ARCH=\"RHEL7-x86_64\" -DXEPICS_BASE=\"/usr/local/epics\" 
-USR_CFLAGS += -DXPYDEV_BASE=\"$(INSTALL_LOCATION)\" -DPYDIR=\"python3.6\"
-USR_LDFLAGS += -L/usr/local/epics/base-3.14.12/lib/RHEL7-x86_64
-LIB_SYS_LIBS += python3.6m 
-#LIB_SYS_LIBS += python3.6m recIoc softDevIoc miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc
+USR_CFLAGS += -I/usr/include/$(PY) -DHAVE_NUMPY 
+USR_CFLAGS += -DXEPICS_ARCH=\"$(T_A)\" -DXEPICS_BASE=\"$(EPICS_BASE)\" 
+USR_CFLAGS += -DXPYDEV_BASE=\"$(INSTALL_LOCATION)\" -DPYDIR=\"$(PY)\"
+LIB_SYS_LIBS += $(PY) 
 # MISCS  would be the place to keep the stream device template files