Re-adjust to use newly-fixed Diracxx CMakelist. Find include and lib …

…directories under DIRACXX_HOME directory.
JeffersonLab · Aug 16, 2021 · bd30024 · bd30024
1 parent 64c941f
commit bd30024
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -18,10 +18,9 @@ ifndef G4SYSTEM
 endif
 
 ifdef DIRACXX_HOME
-    UNAME_P := $(shell uname -p)
-    DIRACXX_CMAKE := $(shell if [ -d $(DIRACXX_HOME)/$(UNAME_P) ]; then echo true; else echo false; fi)
+    DIRACXX_CMAKE := $(shell if [ -f $(DIRACXX_HOME)/CMakeLists.txt ]; then echo true; else echo false; fi)
     ifeq ($(DIRACXX_CMAKE), true)
-        CPPFLAGS += -I$(DIRACXX_HOME)/$(UNAME_P)/include -DUSING_DIRACXX -L$(DIRACXX_HOME)/$(UNAME_P)/lib -lDirac
+        CPPFLAGS += -I$(DIRACXX_HOME)/include -DUSING_DIRACXX -L$(DIRACXX_HOME)/lib -lDirac
     else
         CPPFLAGS += -I$(DIRACXX_HOME) -DUSING_DIRACXX -L$(DIRACXX_HOME) -lDirac
     endif