--- linuxx86/hinst.orig	Thu Nov  2 08:55:48 2006
+++ linuxx86/hinst	Wed Apr 25 10:25:45 2007
@@ -86,7 +86,7 @@
 fi
 
 #  Install in here by default.
-DefaultInstallDir=/usr/lib/ICAClient
+DefaultInstallDir=/usr/local/ICAClient
 
 #  Default CDROM mount point
 DefaultCDSourceDir=/cdrom
@@ -2221,7 +2221,7 @@
 	then
 		:
 	else
-		/bin/false
+		/usr/bin/false
 		return 
 	fi
 
@@ -2267,7 +2267,7 @@
 		fi
 	fi
 
-	/bin/true
+	/usr/bin/true
 }
 
 ###############################################################################
@@ -2390,26 +2390,18 @@
 
 netscape_integrate()
 {
-  user_echo $integrate_netscape1
   if test -z "$SU_INSTALL"
   then
     set_npui_variables
     found_netscape 
   else
     search_ok=0
-    EXTRA_BROWSERS=`find_browsers`
-  
-    if  test -d "/usr/lib/netscape"\
-	|| test -d "/usr/local/netscape"\
-	|| test -d "/opt/netscape"\
-	|| test -d "/usr/local/lib/netscape"\
-	|| test -d "/usr/dt/appconfig/netscape"\
-	|| test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
-	|| test "$EXTRA_BROWSERS" != ""
-    then
+    case ${FOUND_NS} in
+    TRUE)
   	user_echo $integrate_netscape3
   	found_netscape 
-    else
+	;;
+    *)
 	user_prompt $integrate_netscape2
  	getyesno $INSTALLER_NO
 	if [ "$ANSWER" = "$INSTALLER_YES" ]
@@ -2418,7 +2410,8 @@
 	else
   		user_echo $integrate_netscape6
 	fi
-    fi
+	;;
+    esac
   fi
 
     # Create utility script files in install root.
@@ -3056,55 +3049,6 @@
     echo "$BINDIR"
 }
 
-################################################################################
-#
-# find_browsers
-#
-# Returns a list of directories containing new-style mozilla-based browsers 
-# that may be launched by files on the $PATH.
-#
-################################################################################
-find_browsers()
-{
-    PROGS="netscape mozilla firefox"
-    DIST_BIN_DIR=""
-    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox /usr/lib/mozilla"
-
-    case $op_system in
-       SunOS) if
-                 /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
-              then
-                 relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
-                 STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
-
-                 # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in!
-                 case `uname -r` in
-                    5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
-                         ;;
-                    *)   ;;
-                 esac
-              fi;;
-       *) ;;
-    esac
-
-    for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
-    do
-	echo $d
-    done | sort -u | while read d
-    do 
-	for p in $PROGS
-	do    
-	    # Find the each instance of each named browser
-	    PROG=$d/$p
-	    if test -f $PROG
-	    then
-		# Where is the installation and what version is it?
-		find_extra_bin_dirs $PROG
-	    fi
-	done
-    done | sort -u
-}
-
 BROWSER_LIST_KEY="BROWSER_DIR"
 ################################################################################
 #
@@ -3330,7 +3274,10 @@
 XDG_TARGET_DIR="/usr/share/applications"
 TL_MENU_DIR="Vendor_menus/Applications"                    # TurboLinux
 TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR
-DEFAULT_GNOME_TARGET_DIRS="/etc/opt/gnome/SuSE/Internet"
+EFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
+                           /usr/local/share/applnk/Internet \
+                           /usr/local/share/applnk/Networking \
+                           /etc/opt/gnome/SuSE/Internet"
 DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \
                          /usr/share/applnk-mdk/Networking \
                          $TL_TOP_DIR/Internet \