aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-10-10 17:03:43 +0000
committerIan Lance Taylor <ian@airs.com>1996-10-10 17:03:43 +0000
commitd9f3f187da7bb80a24995cc5ab0434ab4895b4aa (patch)
treea2469387dcc930bb8aa52dee16dd36e796f0f449 /configure
parentd7a579960b3033e6f8b697736de6dc2d8bff7c00 (diff)
downloadfsf-binutils-gdb-d9f3f187da7bb80a24995cc5ab0434ab4895b4aa.zip
fsf-binutils-gdb-d9f3f187da7bb80a24995cc5ab0434ab4895b4aa.tar.gz
fsf-binutils-gdb-d9f3f187da7bb80a24995cc5ab0434ab4895b4aa.tar.bz2
* configure: Rework yesterday's sed script patch.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure20
1 files changed, 5 insertions, 15 deletions
diff --git a/configure b/configure
index 36afd7d..0af67ed 100755
--- a/configure
+++ b/configure
@@ -673,10 +673,8 @@ fi
if [ -z "${CC}" -a -r Makefile ]; then
sed -n -e ':loop
/\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
s/\\\n//g
+t loop
/^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc
CC=`tail -1 Makefile.cc`
rm -f Makefile.cc
@@ -685,10 +683,8 @@ fi
if [ -z "${CXX}" -a -r Makefile ]; then
sed -n -e ':loop
/\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
s/\\\n//g
+t loop
/^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc
CXX=`tail -1 Makefile.cc`
rm -f Makefile.cc
@@ -746,10 +742,8 @@ if [ "${build}" != "${host}" ]; then
if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
sed -n -e ':loop
/\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
s/\\\n//g
+t loop
/^'"${var}"'[ ]*=/ s/'"${var}"'[ ]*=[ ]*\(.*\)/\1/p' \
< Makefile > Makefile.v
t=`tail -1 Makefile.v`
@@ -1114,19 +1108,15 @@ EOF
-e "/^CC[ ]*=/{
:loop1
/\\\\$/ N
- s/\\\\$/\\\\*hpuxsedbug*/
- /\\\\$/ b loop1
- s/\\\\\\*hpuxsedbug\\*/\\\\/g
s/\\\\\\n//g
+ t loop1
s%^CC[ ]*=.*$%CC = ${CC}%
}" \
-e "/^CXX[ ]*=/{
:loop2
/\\\\$/ N
- s/\\\\$/\\\\*hpuxsedbug*/
- /\\\\$/ b loop2
- s/\\\\\\*hpuxsedbug\\*/\\\\/g
s/\\\\\\n//g
+ t loop2
s%^CXX[ ]*=.*$%CXX = ${CXX}%
}" \
-e "s:^SHELL[ ]*=.*$:SHELL = ${config_shell}:" \