1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
|
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")
|