--- cgnstools-2.5.2.orig/configure
+++ cgnstools-2.5.2/configure
@@ -1568,9 +1568,9 @@
   fi
   cgnslib=`grep "^LIBCGNS *=" $CGNSDIR/make.$SYSTEM | sed "s/^LIBCGNS *= *//"`
   if test -z `echo $cgnslib | grep "/"`; then
-    CGNSLIB=\$\(CGNSDIR\)/lib/\$\(LIBCGNS\)
+    CGNSLIB=/usr/lib/libcgns.so
   else
-    CGNSLIB=\$\(CGNSDIR\)/\$\(LIBCGNS\)
+    CGNSLIB=/usr/lib/libcgns.so
   fi
   HDF5LIBS="\$(HDF5LIB) \$(SZIPLIB) \$(ZLIBLIB)"
 else
@@ -1583,7 +1583,7 @@
       `ls -dr ../* 2>/dev/null` \
       `ls -dr ../../* 2>/dev/null` \
       `ls -dr ../../../* 2>/dev/null` ; do
-      if test -f "$d/src/ADF.h" && test -f "$d/src/ADFH.h"; then
+      if test -f "$d/ADF.h" && test -f "$d/src/ADFH.h"; then
         adfhdir=`(cd $d; pwd)`
         echo "$ac_t""$adfhdir" 1>&6
         break
@@ -1591,12 +1591,12 @@
     done
   else
     echo "$ac_t""$adfhdir" 1>&6
-    if test ! -f "$adfhdir/src/ADF.h" || test ! -f "$adfhdir/src/ADFH.h"; then
+    if test ! -f "$adfhdir/ADF.h" || test ! -f "$adfhdir/ADFH.h"; then
       { echo "configure: error: $adfhdir directory does not contain src/ADF.h and src/ADFH.h" 1>&2; exit 1; }
     fi
   fi
-  ADFDIR=$adfhdir/src
-  CGNSLIB=$adfhdir/\$\(SYSTEM\)/libcgns.\$\(A\)
+  ADFDIR=$adfhdir
+  CGNSLIB=/usr/lib/libcgns.so
   if test -f "$adfhdir/make.$SYSTEM"; then
     hdf5lib=`grep "^HDF5LIB *=" $adfhdir/make.$SYSTEM | sed "s/^HDF5LIB *= *//"`
     sziplib=`grep "^SZIPLIB *=" $adfhdir/make.$SYSTEM | sed "s/^SZIPLIB *= *//"`
@@ -1997,7 +1997,7 @@
       `ls -dr ../tk8* 2>/dev/null` \
       `ls -dr ../../tk8* 2>/dev/null` \
       `ls -dr ../../../tk8* 2>/dev/null` ; do
-      if test -f "$d/unix/tkConfig.sh"; then
+      if test -f "$d/../tkConfig.sh"; then
         tkdir=`(cd $d; pwd)`
         break
       fi
@@ -2034,13 +2034,13 @@
     { echo "configure: error: Tcl directory $tcldir not found" 1>&2; exit 1; }
   fi
   tcldir=`(cd $tcldir; pwd)`
-  if test ! -f "$tcldir/unix/tclConfig.sh"; then
+  if test ! -f "$tcldir/../tclConfig.sh"; then
     { echo "configure: error: tclConfig.sh not found in $tcldir/unix" 1>&2; exit 1; }
   fi
   if test -z "$tkdir"; then
     dir=`dirname $tcldir`
     for d in `ls -dr $dir/tk* 2>/dev/null` ; do
-      if test -f "$d/unix/tkConfig.sh"; then
+      if test -f "$d/../tkConfig.sh"; then
         tkdir=$d
         break
       fi
@@ -2056,14 +2056,14 @@
     { echo "configure: error: Tk directory $tkdir not found" 1>&2; exit 1; }
   fi
   tkdir=`(cd $tkdir; pwd)`
-  TKCONFIG="$tkdir/unix/tkConfig.sh"
+  TKCONFIG="$tkdir/../tkConfig.sh"
   if test ! -f "$TKCONFIG"; then
     { echo "configure: error: tkConfig.sh not found in $tkdir/unix" 1>&2; exit 1; }
   fi
   if test -z "$tcldir"; then
     dir=`dirname $tkdir`
     for d in `ls -dr $dir/tcl* 2>/dev/null` ; do
-      if test -f "$d/unix/tclConfig.sh"; then
+      if test -f "$d/../tclConfig.sh"; then
         tcldir=$d
         break
       fi
@@ -2073,8 +2073,8 @@
     fi
   fi
   . $TKCONFIG
-  tcllib=`ls -d $tcldir/unix/libtcl8* 2>/dev/null`
-  tklib=`ls -d $tkdir/unix/libtk8* 2>/dev/null`
+  tcllib=`ls -d $tcldir/libtcl8* 2>/dev/null`
+  tklib=`ls -d $tkdir/libtk8* 2>/dev/null`
   X11LIBS=""
   TKINCS="-I$tcldir/generic -I$tkdir/generic"
   if test "$ac_cv_cygwin" = "yes"; then
--- cgnstools-2.5.2.orig/make.defs.in
+++ cgnstools-2.5.2/make.defs.in
@@ -3,7 +3,7 @@
 SYSTEM = @SYSTEM@
 CGNSDIR = @CGNSDIR@
 
-include $(CGNSDIR)/make.$(SYSTEM)
+# include $(CGNSDIR)/make.$(SYSTEM)
 
 ADFINC = @ADFDIR@
 
@@ -40,7 +40,7 @@
 # strip command for executables - set to true if not used
 #------------------------------------------------------------------------
 
-STRIP = @STRIP@
+STRIP = true
 
 #------------------------------------------------------------------------
 # library archiver and ranlib
@@ -78,7 +78,7 @@
 
 BIN_INSTALL_DIR = @BIN_INSTALL_DIR@
 EXE_INSTALL_DIR = @EXE_INSTALL_DIR@
-WSH_INSTALL_DIR = $(EXE_INSTALL_DIR)/cgnswish
+WSH_INSTALL_DIR = $(EXE_INSTALL_DIR)
 LIB_INSTALL_DIR = @LIB_INSTALL_DIR@
 
 #-----------------------------------------------------------------------