--- perl-5.8.7/Configure.bak	2006-02-14 20:27:30.000000000 -0500
+++ perl-5.8.7/Configure	2006-02-14 20:31:34.133805720 -0500
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/glibc2/bin/sh
 #
 # If these # comments don't work, trim them. Don't worry about any other
 # shell scripts, Configure will trim # comments from them for you.
@@ -86,8 +86,8 @@
 fi
 
 : Proper PATH setting
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+paths='/usr/glibc2/bin'
+paths="$paths /opt/bin /opt/glibc2/bin /opt/glibc2 /opt/lbin"
 paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
 paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
 paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
@@ -121,14 +121,14 @@
 fi
 if test -d /usr/lpp -a -f /usr/bin/bsh -a -f /usr/bin/uname; then
 	if test X`/usr/bin/uname -v` = X4; then
-		avoidksh="to avoid AIX 4's /bin/sh"
+		avoidksh="to avoid AIX 4's /usr/glibc2/bin/sh"
 		newsh=/usr/bin/bsh
 	fi
 fi
 if test -f /osf_boot -a -f /usr/sbin/setld; then
 	if test X`/usr/bin/uname -s` = XOSF1; then
 	        avoidksh="to avoid Digital UNIX' ksh"
-	        newsh=/bin/sh
+	        newsh=/usr/glibc2/bin/sh
 	        unset BIN_SH # if this is 'xpg4' sh will start up ksh
 	fi
 fi
@@ -1225,7 +1225,7 @@
 archname=''
 : Possible local include directories to search.
 : Set locincpth to "" in a hint file to defeat local include searches.
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
+locincpth="/usr/glibc2/include /opt/glibc2/include /usr/gnu/include"
 locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
 :
 : no include file wanted by default
@@ -1236,12 +1236,12 @@
 : change the next line if compiling for Xenix/286 on Xenix/386
 xlibpth='/usr/lib/386 /lib/386'
 : Possible local library directories to search.
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+loclibpth="/usr/glibc2/lib /opt/glibc2/lib /usr/gnu/lib"
 loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
 
 : general looking path for locating libraries
 glibpth="/lib /usr/lib $xlibpth"
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/glibc2/lib"
 test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
 test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
 
@@ -1284,7 +1284,7 @@
 '')
 	case "$SYSTYPE" in
 	*bsd*|sys5*) xxx="/$SYSTYPE/bin/sh";;
-	*) xxx='/bin/sh';;
+	*) xxx='/usr/glibc2/bin/sh';;
 	esac
 	if test -f "$xxx"; then
 		sh="$xxx"
@@ -1316,7 +1316,7 @@
 '')	cat >&2 <<EOM
 $me:  Fatal Error:  I can't find a Bourne Shell anywhere.  
 
-Usually it's in /bin/sh.  How did you even get this far?
+Usually it's in /usr/glibc2/bin/sh.  How did you even get this far?
 Please contact me (Perl Maintainers) at perlbug@perl.org and 
 we'll try to straighten this all out.
 EOM
@@ -1328,7 +1328,7 @@
 if `$sh -c '#' >/dev/null 2>&1`; then
 	shsharp=true
 	spitshell=cat
-	xcat=/bin/cat
+	xcat=/usr/glibc2/bin/cat
 	test -f $xcat$_exe || xcat=/usr/bin/cat
 	if test ! -f $xcat$_exe; then
 		for p in `echo $PATH | sed -e "s/$p_/ /g"` $paths; do
@@ -2735,7 +2735,7 @@
 	case "$targetrun" in
 	ssh|rsh)
 	    cat >$run <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 case "\$1" in
 -cwd)
   shift
@@ -2762,7 +2762,7 @@
 	case "$targetmkdir" in
 	*/Cross/mkdir)
 	    cat >$targetmkdir <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 $targetrun -l $targetuser $targethost "mkdir -p \$@"
 EOF
 	    $chmod a+rx $targetmkdir
@@ -2774,7 +2774,7 @@
 	case "$targetto" in
 	scp|rcp)
 	    cat >$to <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 for f in \$@
 do
   case "\$f" in
@@ -2792,7 +2792,7 @@
 EOF
 	    ;;
 	cp) cat >$to <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 for f in \$@
 do
   case "\$f" in
@@ -2816,7 +2816,7 @@
 	case "$targetfrom" in
 	scp|rcp)
 	  cat >$from <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 for f in \$@
 do
   $rm -f \$f
@@ -2826,7 +2826,7 @@
 EOF
 	    ;;
 	cp) cat >$from <<EOF
-#!/bin/sh
+#!/usr/glibc2/bin/sh
 for f in \$@
 do
   $rm -f \$f
@@ -4421,7 +4421,7 @@
 : Set private lib path
 case "$plibpth" in
 '') if ./mips; then
-		plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
+		plibpth="$incpath/usr/lib /usr/glibc2/lib /usr/ccs/lib"
 	fi;;
 esac
 case "$libpth" in
@@ -5733,7 +5733,7 @@
 : determine root of directory hierarchy where package will be installed.
 case "$prefix" in
 '')
-	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
+	dflt=`./loc . /usr/glibc2 /usr/glibc2 /glibc2 /opt /usr`
 	;;
 *?/)
 	dflt=`echo "$prefix" | sed 's/.$//'`
@@ -5924,7 +5924,7 @@
 installstyle=$dflt
 
 : determine where private library files go
-: Usual default is /usr/local/lib/perl5/$version.
+: Usual default is /usr/glibc2/lib/perl5/$version.
 : Also allow things like /opt/perl/lib/$version, since 
 : /opt/perl/lib/perl5... would be redundant.
 : The default "style" setting is made in installstyle.U
@@ -5960,8 +5960,8 @@
 : determine where public architecture dependent libraries go
 set archlib archlib
 eval $prefixit
-: privlib default is /usr/local/lib/$package/$version
-: archlib default is /usr/local/lib/$package/$version/$archname
+: privlib default is /usr/glibc2/lib/$package/$version
+: archlib default is /usr/glibc2/lib/$package/$version/$archname
 : privlib may have an optional trailing /share.
 tdflt=`echo $privlib | $sed 's,/share$,,'`
 tdflt=$tdflt/$archname
@@ -6426,7 +6426,7 @@
 siteprefixexp="$ansexp"
 
 : determine where site specific libraries go.
-: Usual default is /usr/local/lib/perl5/site_perl/$version
+: Usual default is /usr/glibc2/lib/perl5/site_perl/$version
 : The default "style" setting is made in installstyle.U
 : XXX No longer works with Prefixit stuff.
 prog=`echo $package | $sed 's/-*[0-9.]*$//'`
@@ -6461,8 +6461,8 @@
 fi
 
 : determine where site specific architecture-dependent libraries go.
-: sitelib  default is /usr/local/lib/perl5/site_perl/$version
-: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname
+: sitelib  default is /usr/glibc2/lib/perl5/site_perl/$version
+: sitearch default is /usr/glibc2/lib/perl5/site_perl/$version/$archname
 : sitelib may have an optional trailing /share.
 case "$sitearch" in
 '')	dflt=`echo $sitelib | $sed 's,/share$,,'`
@@ -6554,7 +6554,7 @@
 	;;
 *)	d_vendorlib="$define"
 	: determine where vendor-supplied modules go.
-	: Usual default is /usr/local/lib/perl5/vendor_perl/$version
+	: Usual default is /usr/glibc2/lib/perl5/vendor_perl/$version
 	case "$vendorlib" in
 	'')
 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
@@ -6588,8 +6588,8 @@
 	;;
 *)	d_vendorarch="$define"
 	: determine where vendor-supplied architecture-dependent libraries go.
-	: vendorlib  default is /usr/local/lib/perl5/vendor_perl/$version
-	: vendorarch default is /usr/local/lib/perl5/vendor_perl/$version/$archname
+	: vendorlib  default is /usr/glibc2/lib/perl5/vendor_perl/$version
+	: vendorarch default is /usr/glibc2/lib/perl5/vendor_perl/$version/$archname
 	: vendorlib may have an optional trailing /share.
 	case "$vendorarch" in
 	'')	dflt=`echo $vendorlib | $sed 's,/share$,,'`
@@ -7915,11 +7915,11 @@
 case "$sysman" in
 '') 
 	syspath='/usr/share/man/man1 /usr/man/man1'
-	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
+	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/glibc2/man1"
 	syspath="$syspath /usr/man/u_man/man1"
 	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
-	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
-	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
+	syspath="$syspath /usr/glibc2/man/u_man/man1 /usr/glibc2/man/l_man/man1"
+	syspath="$syspath /usr/man/man.L /glibc2/man/man1 /usr/glibc2/man/man1"
 	sysman=`./loc . /usr/man/man1 $syspath`
 	;;
 esac
@@ -8554,8 +8554,8 @@
 	: guess some guesses
 	$test -d /usr/share/scripts && dflt=/usr/share/scripts
 	$test -d /usr/share/bin     && dflt=/usr/share/bin
-	$test -d /usr/local/script  && dflt=/usr/local/script
-	$test -d /usr/local/scripts && dflt=/usr/local/scripts
+	$test -d /usr/glibc2/script  && dflt=/usr/glibc2/script
+	$test -d /usr/glibc2/scripts && dflt=/usr/glibc2/scripts
 	$test -d $prefixexp/script  && dflt=$prefixexp/script
 	set dflt
 	eval $prefixup
@@ -18769,7 +18769,7 @@
 	case "$ranlib" in
 	:) ranlib='';;
 	'')
-		ranlib=`./loc ranlib X /usr/bin /bin /usr/local/bin`
+		ranlib=`./loc ranlib X /usr/bin /bin /usr/glibc2/bin`
 		$test -f $ranlib || ranlib=''
 		;;
 	esac