File ns2-tcl_detection.patch of Package ns2

Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -5485,7 +5485,8 @@ TCL_TCL_PLACES_D="$d \
 		$d/lib \
 		$d/library \
 		"
-TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
+TCL_TCL_PLACES="$libdir/tcl/tcl$TCL_HI_VERS \
+		../lib/tcl$TCL_HI_VERS \
 		../lib/tcl$TCL_ALT_VERS \
 		../lib/tcl$TCL_VERS \
 		../lib/tcl \
@@ -5550,7 +5551,7 @@ TCL_H_PLACES_D="$d/generic \
 		$d/include \
 		/usr/local/include \
 		"
-TCL_H_PLACES=" \
+TCL_H_PLACES="  $includedir \
 		../include \
 		../tcl$TCL_VERS/unix \
 		../tcl$TCL_ALT_VERS/unix \
@@ -5606,7 +5607,7 @@ TCL_H_PLACES=" \
 TCL_LIB_PLACES_D="$d \
 		$d/lib \
 		$d/unix"
-TCL_LIB_PLACES=" \
+TCL_LIB_PLACES="$libdir \
 		../lib \
 		../tcl$TCL_VERS/unix \
 		../tcl$TCL_HI_VERS/unix \
@@ -6083,7 +6084,7 @@ TK_TCL_PLACES_D="$d \
                 $d/../lib/tk \
                 $d/lib \
                 $d/library"
-TK_TCL_PLACES=" \
+TK_TCL_PLACES=" $libdir/tcl/tk$TK_HI_VERS \
 		../lib/tk$TK_HI_VERS \
 		../lib/tk$TK_VERS \
 		../lib/tk$TK_ALT_VERS \
@@ -6141,7 +6142,7 @@ TK_H_PLACES_D="$d \
 		$d/include/tk$TK_HI_VERS \
 		$d/include/tk$TK_OLD_VERS \
                 $d/include"
-TK_H_PLACES=" \
+TK_H_PLACES="   $includedir \
 		../include \
 		../tk$TK_VERS/generic \
                 ../tk$TK_ALT_VERS/generic \
@@ -6182,7 +6183,7 @@ TK_H_PLACES=" \
 TK_LIB_PLACES_D="$d \
                 $d/lib \
 		$d/unix"
-TK_LIB_PLACES=" \
+TK_LIB_PLACES=" $libdir \
 		../lib \
 		../lib/tk$TK_HI_VERS \
 		../lib/tk$TK_VERS \
@@ -6434,7 +6435,8 @@ OTCL_ALT_VERS=1.0
 
 OTCL_H_PLACES_D="$d \
 		$d/include"
-OTCL_H_PLACES="../otcl \
+OTCL_H_PLACES=" $includedir \
+		../otcl \
 		/usr/src/local/otcl \
 		../otcl-$OTCL_VERS \
 		/import/otcl/include \
@@ -6447,7 +6449,8 @@ OTCL_H_PLACES="../otcl \
 OTCL_LIB_PLACES_D="$d \
 		$d/lib \
 		"
-OTCL_LIB_PLACES="../otcl \
+OTCL_LIB_PLACES="$libdir
+		../otcl \
 		../otcl-$OTCL_VERS \
 		../otcl-$OTCL_ALT_VERS \
 		$prefix/lib \
@@ -6637,7 +6640,7 @@ fi
 TCLCL_VERS=1.20
 TCLCL_ALT_VERS=1.0
 
-TCLCL_H_PLACES="\
+TCLCL_H_PLACES="$includedir \
 		../tclcl-$TCLCL_VERS \
 		../tclcl-$TCLCL_ALT_VERS \
 		../tclcl \
@@ -6653,7 +6656,7 @@ TCLCL_H_PLACES="\
                 /usr/include"
 TCLCL_H_PLACES_D="$d \
  		$d/include"
-TCLCL_LIB_PLACES="\
+TCLCL_LIB_PLACES="$libdir \
 		../tclcl-$TCLCL_VERS \
 		../tclcl-$TCLCL_ALT_VERS \
 		../tclcl \
@@ -6671,7 +6674,7 @@ TCLCL_LIB_PLACES_D="\
         $d \
         $d/lib \
         $d/bin"
-TCLCL_PROG_PLACES="\
+TCLCL_PROG_PLACES="$bindir \
 		../tclcl-$TCLCL_VERS \
 		../tclcl-$TCLCL_ALT_VERS \
 		../tclcl \