From: Bruno Haible Date: Sun, 4 Feb 2018 09:42:45 +0000 (+0100) Subject: signal-h, monetary, strings: Fix build failure in some cases. X-Git-Tag: v1.0~5738 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d9f3d91f762d403061be6ccad126ff753eb1a8c0;p=gnulib.git signal-h, monetary, strings: Fix build failure in some cases. Reported by Tim Rühsen . * 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. --- diff --git a/ChangeLog b/ChangeLog index 340dc226c3..14be7f241f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-02-04 Bruno Haible + + signal-h, monetary, strings: Fix build failure in some cases. + Reported by Tim Rühsen . + * 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 maint.mk: exempt "/proc/filesystems" from "file system" syntax check diff --git a/modules/monetary b/modules/monetary index c8be360018..8afe1d811e 100644 --- a/modules/monetary +++ b/modules/monetary @@ -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)' \ diff --git a/modules/signal-h b/modules/signal-h index fe9af81cf8..810e2bf6da 100644 --- a/modules/signal-h +++ b/modules/signal-h @@ -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' \ diff --git a/modules/strings b/modules/strings index ced757dec9..919b49de4f 100644 --- a/modules/strings +++ b/modules/strings @@ -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' \