From 9182195eaf3d9b04231de22800ced02944a947af Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 12 Apr 2005 08:53:25 +0000
Subject: 2005-04-12	Ralf Corsepius <ralf.corsepius@rtems.org>

	* setup, setup.def, gcc3newlib/mkspec.in:
	s/gcc3newlib_rpm_release/gccnewlib_rpm_release/g.
---
 scripts/ChangeLog            | 5 +++++
 scripts/gcc3newlib/mkspec.in | 2 +-
 scripts/setup                | 6 +++---
 scripts/setup.def            | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 2c2a0d265e..7c76bacdce 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-12	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* setup, setup.def, gcc3newlib/mkspec.in:
+	s/gcc3newlib_rpm_release/gccnewlib_rpm_release/g.
+
 2005-04-12	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* setup: Fixup messages.
diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in
index 2d86229d3e..58fab4bd17 100644
--- a/scripts/gcc3newlib/mkspec.in
+++ b/scripts/gcc3newlib/mkspec.in
@@ -62,7 +62,7 @@ fi
 # note that the variables in the gcc3newlib directory are actually the same
 sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s,@PATCH3\@,${PATCH3}," \
-    -e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
+    -e "s%@Release\@%${gccnewlib_rpm_release}%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \
     -e "s,@rpmprefix\@,@rpmprefix@,g" \
diff --git a/scripts/setup b/scripts/setup
index c6bda1dca4..ccc1f3db4d 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -36,7 +36,7 @@ do
   echo "f gcc patch version       : $gcc_patch_version"
   echo "g newlib version          : $newlib_version"
   echo "h newlib patch version    : $newlib_patch_version"
-  echo "i gcc3/newlib rpm release : $gcc3newlib_rpm_release"
+  echo "i gcc/newlib rpm release  : $gccnewlib_rpm_release"
   echo
 
   echo -n "[0-9a-d] or any other key to quit >"
@@ -69,7 +69,7 @@ do
   h) echo -n "NEWLIB patch version>"
      read newlib_patch_version ;;
   i) echo -n "GCC3/NEWLIB RPM release >"
-     read gcc3newlib_rpm_release ;;
+     read gccnewlib_rpm_release ;;
   *) 
      return 0 ;;
   esac
@@ -100,7 +100,7 @@ echo "newlib_version=$newlib_version" >> $CFG
 echo "newlib_patch_version=$newlib_patch_version" >> $CFG
 echo "gcc_version=$gcc_version" >> $CFG
 echo "gcc_patch_version=$gcc_patch_version" >> $CFG
-echo "gcc3newlib_rpm_release=$gcc3newlib_rpm_release" >> $CFG
+echo "gccnewlib_rpm_release=$gccnewlib_rpm_release" >> $CFG
 
 echo " done"
 test -f Makefile || ./configure
diff --git a/scripts/setup.def b/scripts/setup.def
index 2b9b8ced28..d63c5fb3c8 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -19,4 +19,4 @@ newlib_patch_version=
 gcc_version=3.3.5
 gcc_suffix=.tar.gz
 gcc_patch_version=20041030
-gcc3newlib_rpm_release=2
+gccnewlib_rpm_release=2
-- 
cgit v1.2.3