CONFIG: adjust adios config paths

wmake/rules/General/ADIOS2

@@ -4,10 +4,9 @@
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
 
-# Obtain prefix and library information via adios2-config
-ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)
-ADIOS_LIBS   := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs)
+# May need to strip off rpath ...
 
-ADIOS_INC    = -I${ADIOS_PREFIX}/include
+ADIOS_FLAGS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --cxx-flags)
+ADIOS_LIBS  := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --cxx-libs)
 
 #------------------------------------------------------------------------------

wmake/scripts/have_adios2

@@ -114,8 +114,6 @@ have_adios2()
         return 2
     }
 
-    header="${header%/*}"   # Strip one-level (include/adios2/...)
-
     # OK
     export HAVE_ADIOS2=true
     export ADIOS2_ARCH_PATH="$prefix"