Merge pull request #47 from keenanlang/master

Allow alternative architecture names
epics-modules · Nov 29, 2023 · 2112012 · 2112012
2 parents af2cfe5 + a918b13
commit 2112012
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/xspress3App/src/Makefile b/xspress3App/src/Makefile
@@ -8,9 +8,11 @@ include $(TOP)/configure/CONFIG
 
 DATA+=xsp3.xml
 
-ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
+ifeq (Linux, $(OS_CLASS))
+ifeq (x86_64, $(ARCH_CLASS))
   LIBRARY_IOC_Linux += xspress3Epics
 endif
+endif
 
 DBD += xspress3Support.dbd
 

diff --git a/xspress3Support/Makefile b/xspress3Support/Makefile
@@ -12,7 +12,8 @@ INC += xspress3_dma_protocol.h
 INC += os9types.h
 INC += xspress3_data_mod.h
 
-ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
+ifeq (Linux, $(OS_CLASS))
+ifeq (x86_64, $(ARCH_CLASS))
 #LIB_INSTALLS_Linux += ../os/$(T_A)/libFemClient.a
 LIB_INSTALLS_Linux += ../os/linux-x86_64/libxspress3.so.1.0
 LIB_INSTALLS_Linux += ../os/linux-x86_64/libimg_mod.so.1.0
@@ -25,6 +26,7 @@ LIB_INSTALLS_Linux += ../os/linux-x86_64/libimg_mod.so
 #BIN_INSTALLS_Linux += ../os/linux-x86_64)/xspress3test
 #BIN_INSTALLS_Linux += ../os/linux-x86_64)/xspress3.server
 endif
+endif
 
 #=============================