diff options
| -rw-r--r-- | c/src/make/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/make/Makefile.am | 82 |
2 files changed, 45 insertions, 41 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index e6cb01cad5..0a2551513f 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,7 @@ +2011-03-29 Ralf Corsépius <ralf.corsepius@rtems.org> + + * Makefile.am: Use '|' as sed-delimiter. + 2011-03-08 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1760/misc diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am index 3349d5cf99..2ed83a2c47 100644 --- a/c/src/make/Makefile.am +++ b/c/src/make/Makefile.am @@ -31,62 +31,62 @@ endif bsp.cfg: bsp.cfg.in Makefile sed \ - -e "s,[@]HAS_MP[@],$(HAS_MP)," \ - -e "s,[@]HAS_POSIX_API[@],$(HAS_POSIX_API)," \ - -e "s,[@]HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \ - -e "s,[@]HAS_NETWORKING[@],$(HAS_NETWORKING)," \ + -e "s|[@]HAS_MP[@]|$(HAS_MP)|" \ + -e "s|[@]HAS_POSIX_API[@]|$(HAS_POSIX_API)|" \ + -e "s|[@]HAS_CPLUSPLUS[@]|$(HAS_CPLUSPLUS)|" \ + -e "s|[@]HAS_NETWORKING[@]|$(HAS_NETWORKING)|" \ < $(srcdir)/bsp.cfg.in > bsp.cfg CLEANFILES += bsp.cfg target.cfg: target.cfg.in Makefile sed \ - -e "s,[@]CPPFLAGS[@],$(CPPFLAGS)," \ - -e "s,[@]CFLAGS[@],$(CFLAGS)," \ - -e "s,[@]LIBS[@],$(LIBS)," \ - -e "s,[@]CC[@],$(CC)," \ - -e "s,[@]CXX[@],$(CXX)," \ - -e "s,[@]AS[@],$(AS)," \ - -e "s,[@]AR[@],$(AR)," \ - -e "s,[@]NM[@],$(NM)," \ - -e "s,[@]LD[@],$(LD)," \ - -e "s,[@]SIZE[@],$(SIZE)," \ - -e "s,[@]STRIP[@],$(STRIP)," \ - -e "s,[@]RANLIB[@],$(RANLIB)," \ - -e "s,[@]OBJCOPY[@],$(OBJCOPY)," \ - -e "s,[@]RTEMS_CPU[@],$(RTEMS_CPU)," \ - -e "s,[@]RTEMS_HAS_MULTIPROCESSING[@],$(HAS_MP)," \ - -e "s,[@]RTEMS_HAS_POSIX_API[@],$(HAS_POSIX_API)," \ - -e "s,[@]RTEMS_HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \ - -e "s,[@]RTEMS_HAS_NETWORKING[@],$(HAS_NETWORKING)," \ + -e "s|[@]CPPFLAGS[@]|$(CPPFLAGS)|" \ + -e "s|[@]CFLAGS[@]|$(CFLAGS)|" \ + -e "s|[@]LIBS[@]|$(LIBS)|" \ + -e "s|[@]CC[@]|$(CC)|" \ + -e "s|[@]CXX[@]|$(CXX)|" \ + -e "s|[@]AS[@]|$(AS)|" \ + -e "s|[@]AR[@]|$(AR)|" \ + -e "s|[@]NM[@]|$(NM)|" \ + -e "s|[@]LD[@]|$(LD)|" \ + -e "s|[@]SIZE[@]|$(SIZE)|" \ + -e "s|[@]STRIP[@]|$(STRIP)|" \ + -e "s|[@]RANLIB[@]|$(RANLIB)|" \ + -e "s|[@]OBJCOPY[@]|$(OBJCOPY)|" \ + -e "s|[@]RTEMS_CPU[@]|$(RTEMS_CPU)|" \ + -e "s|[@]RTEMS_HAS_MULTIPROCESSING[@]|$(HAS_MP)|" \ + -e "s|[@]RTEMS_HAS_POSIX_API[@]|$(HAS_POSIX_API)|" \ + -e "s|[@]RTEMS_HAS_CPLUSPLUS[@]|$(HAS_CPLUSPLUS)|" \ + -e "s|[@]RTEMS_HAS_NETWORKING[@]|$(HAS_NETWORKING)|" \ < $(srcdir)/target.cfg.in > target.cfg CLEANFILES += target.cfg host.cfg: host.cfg.in Makefile sed \ - -e "s,[@]CP[@],$(CP)," \ - -e "s,[@]MV[@],$(MV)," \ - -e "s,[@]LN[@],$(LN)," \ - -e "s,[@]SHELL[@],$(SHELL)," \ - -e "s,[@]KSH[@],$(KSH)," \ + -e "s|[@]CP[@]|$(CP)|" \ + -e "s|[@]MV[@]|$(MV)|" \ + -e "s|[@]LN[@]|$(LN)|" \ + -e "s|[@]SHELL[@]|$(SHELL)|" \ + -e "s|[@]KSH[@]|$(KSH)|" \ < $(srcdir)/host.cfg.in > host.cfg CLEANFILES += host.cfg Makefile.inc: Makefile.inc.in Makefile sed \ - -e "s,[@]prefix[@],$(prefix)," \ - -e "s,[@]exec_prefix[@],$(exec_prefix)," \ - -e "s,[@]pkgdatadir[@],$(pkgdatadir)," \ - -e "s,[@]RTEMS_BSP[@],$(RTEMS_BSP)," \ - -e "s,[@]CC[@],$(CC)," \ - -e "s,[@]CXX[@],$(CXX)," \ - -e "s,[@]AS[@],$(AS)," \ - -e "s,[@]AR[@],$(AR)," \ - -e "s,[@]NM[@],$(NM)," \ - -e "s,[@]LD[@],$(LD)," \ - -e "s,[@]SIZE[@],$(SIZE)," \ - -e "s,[@]OBJCOPY[@],$(OBJCOPY)," \ - -e "s,[@]RTEMS_HAS_POSIX_API[@],$(HAS_POSIX_API)," \ - -e "s,[@]RTEMS_HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \ + -e "s|[@]prefix[@]|$(prefix)|" \ + -e "s|[@]exec_prefix[@]|$(exec_prefix)|" \ + -e "s|[@]pkgdatadir[@]|$(pkgdatadir)|" \ + -e "s|[@]RTEMS_BSP[@]|$(RTEMS_BSP)|" \ + -e "s|[@]CC[@]|$(CC)|" \ + -e "s|[@]CXX[@]|$(CXX)|" \ + -e "s|[@]AS[@]|$(AS)|" \ + -e "s|[@]AR[@]|$(AR)|" \ + -e "s|[@]NM[@]|$(NM)|" \ + -e "s|[@]LD[@]|$(LD)|" \ + -e "s|[@]SIZE[@]|$(SIZE)|" \ + -e "s|[@]OBJCOPY[@]|$(OBJCOPY)|" \ + -e "s|[@]RTEMS_HAS_POSIX_API[@]|$(HAS_POSIX_API)|" \ + -e "s|[@]RTEMS_HAS_CPLUSPLUS[@]|$(HAS_CPLUSPLUS)|" \ < $(srcdir)/Makefile.inc.in > Makefile.inc CLEANFILES += Makefile.inc |