Index: libcgns/src/cgnstools/cgnscalc/cgnscalc.sh
===================================================================
--- libcgns.orig/src/cgnstools/cgnscalc/cgnscalc.sh	2025-10-11 14:31:55.866523507 +0200
+++ libcgns/src/cgnstools/cgnscalc/cgnscalc.sh	2025-10-11 14:31:55.857901927 +0200
@@ -6,12 +6,7 @@
 
 # source the setup script
 
-for d in $dir $dir/cgnstools $dir/.. ; do
-  if test -f $d/cgconfig ; then
-    . $d/cgconfig
-    break
-  fi
-done
+. /usr/share/cgnstools/cgconfig
 
 # get the calcwish executable
 
Index: libcgns/src/cgnstools/cgnscalc/unitconv.sh
===================================================================
--- libcgns.orig/src/cgnstools/cgnscalc/unitconv.sh	2025-10-11 14:31:55.866523507 +0200
+++ libcgns/src/cgnstools/cgnscalc/unitconv.sh	2025-10-11 14:31:55.858626465 +0200
@@ -6,12 +6,7 @@
 
 # source the setup script
 
-for d in $dir $dir/cgnstools $dir/.. ; do
-  if test -f $d/cgconfig ; then
-    . $d/cgconfig
-    break
-  fi
-done
+. /usr/share/cgnstools/cgconfig
 
 # The normal wish will work here, but calcwish should
 # be available, and may also be used
Index: libcgns/src/cgnstools/cgnsplot/cgnsplot.sh
===================================================================
--- libcgns.orig/src/cgnstools/cgnsplot/cgnsplot.sh	2025-10-11 14:31:55.866523507 +0200
+++ libcgns/src/cgnstools/cgnsplot/cgnsplot.sh	2025-10-11 14:31:55.858989481 +0200
@@ -6,12 +6,7 @@
 
 # source the setup script
 
-for d in $dir $dir/cgnstools $dir/.. ; do
-  if test -f $d/cgconfig ; then
-    . $d/cgconfig
-    break
-  fi
-done
+. /usr/share/cgnstools/cgconfig
 
 # get the plotwish executable
 
Index: libcgns/src/cgnstools/cgnsview/cgnsnodes.sh
===================================================================
--- libcgns.orig/src/cgnstools/cgnsview/cgnsnodes.sh	2025-10-11 14:31:55.866523507 +0200
+++ libcgns/src/cgnstools/cgnsview/cgnsnodes.sh	2025-10-11 14:31:55.859428879 +0200
@@ -6,12 +6,7 @@
 
 # source the setup script
 
-for d in $dir $dir/cgnstools $dir/.. ; do
-  if test -f $d/cgconfig ; then
-    . $d/cgconfig
-    break
-  fi
-done
+. /usr/share/cgnstools/cgconfig
 
 # The normal wish will work here, but cgiowish should
 # be available, and may also be used
Index: libcgns/src/cgnstools/cgnsview/cgnsview.sh
===================================================================
--- libcgns.orig/src/cgnstools/cgnsview/cgnsview.sh	2025-10-11 14:31:55.866523507 +0200
+++ libcgns/src/cgnstools/cgnsview/cgnsview.sh	2025-10-11 14:31:55.859814733 +0200
@@ -9,12 +9,7 @@
 
 # source the setup script
 
-for d in $dir $dir/cgnstools $dir/.. ; do
-  if test -f $d/cgconfig ; then
-    . $d/cgconfig
-    break
-  fi
-done
+. /usr/share/cgnstools/cgconfig
 
 # get the cgiowish executable
 
Index: libcgns/CMakeLists.txt
===================================================================
--- libcgns.orig/CMakeLists.txt	2025-10-11 14:32:04.000000000 +0200
+++ libcgns/CMakeLists.txt	2025-10-11 14:38:02.777693945 +0200
@@ -91,7 +91,7 @@
 
 set(CGNS_INSTALL_TOOLS_BINDIR "${CMAKE_INSTALL_BINDIR}${install_suffix}" CACHE PATH
     "CGNS: tools binary install location")
-set(CGNS_INSTALL_TOOLS_DATADIR "${CMAKE_INSTALL_DATADIR}${install_suffix}" CACHE PATH
+set(CGNS_INSTALL_TOOLS_DATADIR "${CMAKE_INSTALL_DATADIR}${tools_install_suffix}" CACHE PATH
     "CGNS: arch independent tools data install location")
 
 set(CGNS_BUILD_SHARED "ON" CACHE BOOL "Build a shared version of the library")