From 3c0ddbb1cc980ec6fb6a752a8deb3a7ed5cad5bb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 5 Jul 2005 07:34:16 +0000 Subject: 2005-07-05 Ralf Corsepius * binutils/mkspec.in, gccnewlib/mkspec.in, gdb/mkspec.in: Use ',' as sed pattern delimiter. --- scripts/ChangeLog | 2 ++ scripts/binutils/mkspec.in | 16 ++++++++-------- scripts/gccnewlib/mkspec.in | 22 +++++++++++----------- scripts/gdb/mkspec.in | 16 ++++++++-------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index de3ceac984..2be1252a3a 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,7 @@ 2005-07-05 Ralf Corsepius + * binutils/mkspec.in, gccnewlib/mkspec.in, gdb/mkspec.in: + Use ',' as sed pattern delimiter. * autotools/automake.add: Add %{?dist}. * autotools/autoconf.add: Add %{?dist}. Replace Copyright: by Licence:. diff --git a/scripts/binutils/mkspec.in b/scripts/binutils/mkspec.in index 0c93ec5301..7a9513ec73 100644 --- a/scripts/binutils/mkspec.in +++ b/scripts/binutils/mkspec.in @@ -52,14 +52,14 @@ if test -n "${binutils_patch_version}"; then PATCH1="Patch0: binutils-${binutils_version}-rtems-${binutils_patch_version}.diff" fi -sed -e "s%@Release\@%${binutils_rpm_release}%g" \ - -e "s%@target_alias\@%${target_alias}%g" \ - -e "s%@prefix\@%@prefix@%g" \ +sed -e "s,@Release\@,${binutils_rpm_release},g" \ + -e "s,@target_alias\@,${target_alias},g" \ + -e "s,@prefix\@,@prefix@,g" \ -e "s,@rpmprefix\@,@rpmprefix@,g" \ - -e "s%@rpmgroup\@%@rpmgroup@%g" \ - -e "s%@osversion\@%@osversion@%g" \ - -e "s%@binutils_version\@%${binutils_version}%g" \ - -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \ - -e "s%@binutils_suffix\@%${binutils_suffix}%g" \ + -e "s,@rpmgroup\@,@rpmgroup@,g" \ + -e "s,@osversion\@,@osversion@,g" \ + -e "s,@binutils_version\@,${binutils_version},g" \ + -e "s,@binutils_patch_version\@,${binutils_patch_version},g" \ + -e "s,@binutils_suffix\@,${binutils_suffix},g" \ -e "s,@PATCH1\@,${PATCH1}," \ < ${specsrc} diff --git a/scripts/gccnewlib/mkspec.in b/scripts/gccnewlib/mkspec.in index b7e64560c8..0c0f287c7b 100644 --- a/scripts/gccnewlib/mkspec.in +++ b/scripts/gccnewlib/mkspec.in @@ -59,16 +59,16 @@ fi # note that the variables in the gccnewlib directory are actually the same sed -e "s,@PATCH0\@,${PATCH0}," \ -e "s,@PATCH1\@,${PATCH1}," \ - -e "s%@Release\@%${gccnewlib_rpm_release}%g" \ - -e "s%@target_alias\@%${target_alias}%g" \ - -e "s%@prefix\@%@prefix@%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" \ - -e "s%@rpmgroup\@%@rpmgroup@%g" \ - -e "s%@osversion\@%@osversion@%g" \ - -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\@%${newlib_version}%g" \ - -e "s%@newlib_patch_version\@%${newlib_patch_version}%g" \ - -e "s%@newlib_suffix\@%${newlib_suffix}%g" \ + -e "s,@rpmgroup\@,@rpmgroup@,g" \ + -e "s,@osversion\@,@osversion@,g" \ + -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\@,${newlib_version},g" \ + -e "s,@newlib_patch_version\@,${newlib_patch_version},g" \ + -e "s,@newlib_suffix\@,${newlib_suffix},g" \ < ${specsrc} diff --git a/scripts/gdb/mkspec.in b/scripts/gdb/mkspec.in index eed5cb6ff8..81fd076c63 100644 --- a/scripts/gdb/mkspec.in +++ b/scripts/gdb/mkspec.in @@ -55,13 +55,13 @@ PATCH1="Patch${patchn}: gdb-${gdb_version}-rtems-${gdb_patch_version}.diff" fi sed -e "s,@PATCH1\@,${PATCH1}," \ - -e "s%@Release\@%${gdb_rpm_release}%g" \ - -e "s%@prefix\@%@prefix@%g" \ - -e "s%@target_alias\@%${target_alias}%g" \ + -e "s,@Release\@,${gdb_rpm_release},g" \ + -e "s,@prefix\@,@prefix@,g" \ + -e "s,@target_alias\@,${target_alias},g" \ -e "s,@rpmprefix\@,@rpmprefix@,g" \ - -e "s%@rpmgroup\@%@rpmgroup@%g" \ - -e "s%@osversion\@%@osversion@%g" \ - -e "s%@gdb_version\@%${gdb_version}%g" \ - -e "s%@gdb_patch_version\@%${gdb_patch_version}%g" \ - -e "s%@gdb_suffix\@%${gdb_suffix}%g" \ + -e "s,@rpmgroup\@,@rpmgroup@,g" \ + -e "s,@osversion\@,@osversion@,g" \ + -e "s,@gdb_version\@,${gdb_version},g" \ + -e "s,@gdb_patch_version\@,${gdb_patch_version},g" \ + -e "s,@gdb_suffix\@,${gdb_suffix},g" \ < ${specsrc} -- cgit v1.2.3