gcc_release: Correct logic for updating version.c.

	* gcc_release: Correct logic for updating version.c.  Put
	prereleases into a subdirectory.

From-SVN: r70252

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 4d1ddfc..b90c002 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08  Mark Mitchell  <mark@codesourcery.com>
+
+       * gcc_release: Correct logic for updating version.c.  Put
+       prereleases into a subdirectory.
+
 2003-07-29  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
        * crontab: Update invocation of gcc_release according to the

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 2966b6e..87d3d9c 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -144,7 +144,7 @@ EOF
     for x in gcc/version.c; do 
       y=`basename ${x}`
       (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \
-          sed -e 's|= \".*\"|= \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
+          sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \
          mv ${y}.new ${y} && \
           ${CVS} ci -m 'Update version' ${y}) || \
          error "Could not update ${x}"
@@ -583,7 +583,7 @@ if [ $SNAPSHOT -eq 0 ]; then
   # If this is not a final release, set various parameters acordingly.
   if [ ${FINAL} -ne 1 ]; then
     RELEASE="${RELEASE}-${DATE}"
-    FTP_PATH="${FTP_PATH}/snapshots/"
+    FTP_PATH="${FTP_PATH}/prerelease-${RELEASE}/"
   else
     FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
   fi