From 17436ceffbce52e2948fcb57dd885cf3dfbc9510 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 10 Dec 2013 21:57:15 -0500
Subject: [PATCH] add python version suffix to softIocPY

---
 devsupApp/src/Makefile       | 16 +++++++++-------
 iocBoot/ioccaputlog/st.cmd   |  2 +-
 iocBoot/iocweatherbnl/st.cmd |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/devsupApp/src/Makefile b/devsupApp/src/Makefile
index 311acdc..13aee81 100644
--- a/devsupApp/src/Makefile
+++ b/devsupApp/src/Makefile
@@ -29,7 +29,9 @@ pyDevSup$(PY_LD_VER)_SRCS += dbfield.c
 pyDevSup$(PY_LD_VER)_SRCS += dbdset.c
 
 
-PROD_IOC = softIocPy
+PROD_IOC = softIocPy$(PY_VER)
+PRODNAME = $(addsuffix $(EXE),$(PROD))
+
 # softIocPy.dbd will be created and installed
 DBD += softIocPy.dbd
 
@@ -37,20 +39,20 @@ DBD += softIocPy.dbd
 softIocPy_DBD += base.dbd
 softIocPy_DBD += pyDevSup.dbd
 
-softIocPy_LIBS += pyDevSup$(PY_LD_VER)
+softIocPy$(PY_VER)_LIBS += pyDevSup$(PY_LD_VER)
 
 # softIocPy_registerRecordDeviceDriver.cpp derives from softIocPy.dbd
-softIocPy_SRCS += softIocPy_registerRecordDeviceDriver.cpp
+softIocPy$(PY_VER)_SRCS += softIocPy_registerRecordDeviceDriver.cpp
 
 # Build the main IOC entry point on workstation OSs.
-softIocPy_SRCS_DEFAULT += devsupMain.cpp
-softIocPy_SRCS_vxWorks += -nil-
+softIocPy$(PY_VER)_SRCS_DEFAULT += devsupMain.cpp
+softIocPy$(PY_VER)_SRCS_vxWorks += -nil-
 
 # Add support from base/src/vxWorks if needed
-#softIocPy_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
+#softIocPy$(PY_VER)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 # Finally link to the EPICS Base libraries
-softIocPy_LIBS += $(EPICS_BASE_IOC_LIBS)
+softIocPy$(PY_VER)_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 
 PY += devsup/__init__.py
diff --git a/iocBoot/ioccaputlog/st.cmd b/iocBoot/ioccaputlog/st.cmd
index afcc4ea..9936853 100755
--- a/iocBoot/ioccaputlog/st.cmd
+++ b/iocBoot/ioccaputlog/st.cmd
@@ -1,4 +1,4 @@
-#!../../bin/linux-x86_64/softIocPy
+#!../../bin/linux-x86/softIocPy2.6
 
 < envPaths
 
diff --git a/iocBoot/iocweatherbnl/st.cmd b/iocBoot/iocweatherbnl/st.cmd
index 1e28854..00149f2 100755
--- a/iocBoot/iocweatherbnl/st.cmd
+++ b/iocBoot/iocweatherbnl/st.cmd
@@ -1,4 +1,4 @@
-#!../../bin/linux-x86/softIocPy
+#!../../bin/linux-x86/softIocPy2.6
 
 < envPaths