Use newlib_* instead of gcc3newlib_* for values from setup.*.

scripts/configure.ac

@@ -56,7 +56,7 @@ case "$host" in
 esac
 AC_MSG_RESULT($RPM_CPU)
 
-GCC3NEWLIBVERS="gcc-${gcc_version}-newlib-${gcc3newlib_version}"
+GCC3NEWLIBVERS="gcc-${gcc_version}-newlib-${newlib_version}"
 AC_SUBST(GCC3NEWLIBVERS)
 BINUTILSVERS="binutils-${binutils_version}"
 AC_SUBST(BINUTILSVERS)

scripts/gcc3newlib/mkspec.in

@@ -54,15 +54,15 @@ patchn=`expr $patchn + 1`
 PATCH1="Patch${patchn}: gcc-${gcc_version}-rtems-${gcc_patch_version}.diff"
 fi
 
-if test -n "${gcc3newlib_patch_version}"; then
+if test -n "${newlib_patch_version}"; then
 patchn=`expr $patchn + 1`
-PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
+PATCH3="Patch${patchn}: newlib-${newlib_version}-rtems-${newlib_patch_version}.diff"
 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\@%${newlib_rpm_release}%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \
     -e "s,@rpmprefix\@,@rpmprefix@,g" \
@@ -72,7 +72,7 @@ sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s%@gcc_version\@%${gcc_version}%g" \
     -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \
     -e "s%@gcc_suffix\@%${gcc_suffix}%g" \
-    -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
-    -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
-    -e "s%@newlib_suffix\@%${gcc3newlib_suffix}%g" \
+    -e "s%@newlib_version\@%${newlib_version}%g" \
+    -e "s%@newlib_patch_version\@%${newlib_patch_version}%g" \
+    -e "s%@newlib_suffix\@%${newlib_suffix}%g" \
 < ${specsrc} 

scripts/setup

@@ -34,8 +34,8 @@ do
   echo "d rpm build root          : $rpm_build_root"
   echo "e gcc3 version             : $gcc_version"
   echo "f gcc3 patch version       : $gcc_patch_version"
-  echo "g gcc3 newlib version      : $gcc3newlib_version"
-  echo "h gcc3 newlib patch version: $gcc3newlib_patch_version"
+  echo "g gcc3 newlib version      : $newlib_version"
+  echo "h gcc3 newlib patch version: $newlib_patch_version"
   echo "i gcc3/newlib rpm release  : $gcc3newlib_rpm_release"
   echo
 
@@ -65,9 +65,9 @@ do
   f) echo -n "GCC3 patch version>"
      read gcc_patch_version ;;
   g) echo -n "NEWLIB source >"
-     read gcc3newlib_version ;;
+     read newlib_version ;;
   h) echo -n "NEWLIB patch version>"
-     read gcc3newlib_patch_version ;;
+     read newlib_patch_version ;;
   i) echo -n "GCC3/NEWLIB RPM release >"
      read gcc3newlib_rpm_release ;;
   *) 
@@ -96,8 +96,8 @@ echo "gdb_rpm_release=$gdb_rpm_release" >> $CFG
 echo "rtems_version=$rtems_version" >> $CFG
 echo "rtems_rpm_release=$rtems_rpm_release" >> $CFG
 echo "rpm_build_root=$rpm_build_root" >> $CFG
-echo "gcc3newlib_version=$gcc3newlib_version" >> $CFG
-echo "gcc3newlib_patch_version=$gcc3newlib_patch_version" >> $CFG
+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

scripts/setup.def

@@ -13,9 +13,9 @@ gdb_rpm_release=1
 rtems_version=ss-20000726
 rtems_rpm_release=1
 rpm_build_root=%{_tmppath}
-gcc3newlib_version=1.12.0
-gcc3newlib_suffix=.tar.gz
-gcc3newlib_patch_version=
+newlib_version=1.12.0
+newlib_suffix=.tar.gz
+newlib_patch_version=
 gcc_version=3.3.5
 gcc_suffix=.tar.gz
 gcc_patch_version=20041030