Mercurial > gnulib

changeset 39242:a34ab07b1471

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sun, 04 Feb 2018 10:42:45 +0100
parents d114fefb0a56
children 6828f5d6f32d
files ChangeLog modules/monetary modules/signal-h modules/strings
diffstat 4 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Feb 03 16:57:36 2018 -0800
+++ b/ChangeLog	Sun Feb 04 10:42:45 2018 +0100
@@ -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
--- a/modules/monetary	Sat Feb 03 16:57:36 2018 -0800
+++ b/modules/monetary	Sun Feb 04 10:42:45 2018 +0100
@@ -30,7 +30,7 @@
 	      -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)' \
--- a/modules/signal-h	Sat Feb 03 16:57:36 2018 -0800
+++ b/modules/signal-h	Sun Feb 04 10:42:45 2018 +0100
@@ -28,8 +28,8 @@
 	      -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' \
--- a/modules/strings	Sat Feb 03 16:57:36 2018 -0800
+++ b/modules/strings	Sun Feb 04 10:42:45 2018 +0100
@@ -29,7 +29,7 @@
 	      -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' \