From: Geoffrey Noer <noer@cygnus>
Date: Thu, 30 Apr 1998 01:15:38 +0000 (+0000)
Subject: Wed Apr 29 18:05:52 1998  Geoffrey Noer <noer@cygnus.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1bfa8616c396ea6f5aad3fc5f1f022053b279f2e;p=binutils-gdb.git

Wed Apr 29 18:05:52 1998  Geoffrey Noer <noer@cygnus.com>

        * configure.in: Stop appending EXEEXT to the end of
        SRCONV_PROG (wrong because that variable may contain multiple
        programs)
        * Makefile.in: instead, add EXEEXTs to each SRCONV_PROG
        program
        * configure: regenerate
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0b067e27752..e4da544f39e 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 29 18:05:52 1998  Geoffrey Noer <noer@cygnus.com>
+
+	* configure.in: Stop appending EXEEXT to the end of
+	SRCONV_PROG (wrong because that variable may contain multiple
+	programs)
+	* Makefile.in: instead, add EXEEXTs to each SRCONV_PROG
+	program
+	* configure: regenerate
+
 Tue Apr 28 19:14:34 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* addr2line.c (main): Conditionally call setlocale.
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 78b45b844fe..0cca246812b 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -117,7 +117,7 @@ NLMCONV_PROG=nlmconv
 DLLTOOL_PROG=dlltool
 WINDRES_PROG=windres
 
-SRCONV_PROG=srconv sysdump coffdump 
+SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) 
 
 man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \
 	addr2line.1 nlmconv.1 $(DEMANGLER_PROG).1
diff --git a/binutils/configure b/binutils/configure
index 15416faa08f..f974b37ef12 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -4445,7 +4445,7 @@ do
     if test "x$targ" = "xall"; then
         all_targets=true
 	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)'
+	BUILD_SRCONV='$(SRCONV_PROG)'
 	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
     else
 	case $targ in
@@ -4467,7 +4467,7 @@ do
 	  ;;
 	esac
 	case $targ in
-	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)' ;;
+	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
 	esac
 	case $targ in
 	arm-*pe*)
@@ -4533,7 +4533,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1 | grep ac_space` in
+  case `(ac_space=' '; set) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -4925,7 +4925,6 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
diff --git a/binutils/configure.in b/binutils/configure.in
index db47b9d06e2..8af7f76aae7 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -135,7 +135,7 @@ do
     if test "x$targ" = "xall"; then
         all_targets=true
 	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)'
+	BUILD_SRCONV='$(SRCONV_PROG)'
 	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
     else
 	case $targ in
@@ -159,7 +159,7 @@ changequote([,])dnl
 	  ;;
 	esac
 	case $targ in
-	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)$(EXEEXT)' ;;
+	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
 	esac
 	case $targ in
 	arm-*pe*)