]> Savannah Git Hosting - gnulib.git/commitdiff
signal-h, monetary, strings: Fix build failure in some cases.
authorBruno Haible <bruno@clisp.org>
Sun, 4 Feb 2018 09:42:45 +0000 (10:42 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 4 Feb 2018 09:44:06 +0000 (10:44 +0100)
Reported by Tim Rühsen <tim.ruehsen@gmx.de>.

* modules/signal-h (Makefile.am): In the GNULIB_* substitutions, use '/'
as delimiter in sed command, not '|'.
* modules/monetary (Makefile.am): Likewise.
* modules/strings (Makefile.am): Likewise.

ChangeLog
modules/monetary
modules/signal-h
modules/strings

index 340dc226c3f1582fe8c777d970d5acdfcb20f12b..14be7f241f09637ff01261b336ecb657eda16053 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-02-04  Bruno Haible  <bruno@clisp.org>
+
+       signal-h, monetary, strings: Fix build failure in some cases.
+       Reported by Tim Rühsen <tim.ruehsen@gmx.de>.
+       * modules/signal-h (Makefile.am): In the GNULIB_* substitutions, use '/'
+       as delimiter in sed command, not '|'.
+       * modules/monetary (Makefile.am): Likewise.
+       * modules/strings (Makefile.am): Likewise.
+
 2018-02-03  Jim Meyering  <meyering@fb.com>
 
        maint.mk: exempt "/proc/filesystems" from "file system" syntax check
index c8be360018adee07288040004ce96d613748b86e..8afe1d811e2051b8075db007f94eeea53a6a26f0 100644 (file)
@@ -30,7 +30,7 @@ monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_MONETARY_H''@|$(NEXT_MONETARY_H)|g' \
              -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
-             -e 's|@''GNULIB_STRFMON_L''@|$(GNULIB_STRFMON_L)|g' \
+             -e 's/@''GNULIB_STRFMON_L''@/$(GNULIB_STRFMON_L)/g' \
              -e 's|@''HAVE_STRFMON_L''@|$(HAVE_STRFMON_L)|g' \
              -e 's|@''REPLACE_STRFMON_L''@|$(REPLACE_STRFMON_L)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
index fe9af81cf8bddb5d6bccf52ce27e7ed9489959f4..810e2bf6da745bf33a0fa0a9202bf21713aa76e9 100644 (file)
@@ -28,8 +28,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-             -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-             -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
+             -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \
+             -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \
              -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
              -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
              -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
index ced757dec922b84543f9475c0449ec608b5c4288..919b49de4f5ae7419d24d4b38849790cc86f74a4 100644 (file)
@@ -29,7 +29,7 @@ strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
-             -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \
+             -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
              -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
              -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
              -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \