From dfcffada0bf3f6dfd1ba336fb1647694c55d4f22 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 5 Apr 2006 15:40:40 +0000 Subject: * Makefile.am (GENSCRIPTS): Pass prefix. * Makefile.in: Regenerate. * genscripts.sh: Adjust for extra parameter. * emultempl/elf32.em (parse_ld_so_conf): Return true iff file exists. (check_ld_so_conf): Use ${prefix}/etc/ld.so.conf if it exists. * NEWS: Update. --- ld/genscripts.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'ld/genscripts.sh') diff --git a/ld/genscripts.sh b/ld/genscripts.sh index 76d5dd2560e..e9d4f153a7a 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -4,6 +4,7 @@ # Usage: genscripts_extra.sh \ # srcdir \ # libdir \ +# prefix \ # exec_prefix \ # host \ # target \ @@ -22,6 +23,7 @@ # /sources/ld \ # /usr/local/lib \ # /usr/local \ +# /usr/local \ # sparc-sun-sunos4.1.3 \ # sparc-sun-sunos4.1.3 \ # sparc-sun-sunos4.1.3 \ @@ -59,17 +61,18 @@ srcdir=$1 libdir=$2 -exec_prefix=$3 -host=$4 -target=$5 -target_alias=$6 -EMULATION_LIBPATH=$7 -NATIVE_LIB_DIRS=$8 -use_sysroot=$9 +prefix=$3 +exec_prefix=$4 +host=$5 +target=$6 +target_alias=$7 +EMULATION_LIBPATH=$8 +NATIVE_LIB_DIRS=$9 shift 9 -EMULATION_NAME=$1 -TOOL_LIB=$2 -CUSTOMIZER_SCRIPT=$3 +use_sysroot=$1 +EMULATION_NAME=$2 +TOOL_LIB=$3 +CUSTOMIZER_SCRIPT=$4 # Can't use ${TOOL_LIB:-$target_alias} here due to an Ultrix shell bug. if [ "x${TOOL_LIB}" = "x" ] ; then -- cgit v1.2.1