Merge remote-tracking branch 'origin/released'

1 files changed, 30 insertions, 30 deletions

diff --git a/libX11/cpprules.in b/libX11/cpprules.in
index 723560c1c..e1296c699 100644
--- a/libX11/cpprules.in
+++ b/libX11/cpprules.in
@@ -1,30 +1,30 @@
-#							-*- Makefile -*-

-# Rules for generating files using the C pre-processor

-# (Replaces CppFileTarget from Imake)

-

-SED = sed

-

-SUFFIXES += .pre

-

-WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@

-

-CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

-

-# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM

-# to cpp, because that trick does not work on all ANSI C preprocessors.

-# Delete line numbers from the cpp output (-P is not portable, I guess).

-# Allow XCOMM to be preceded by whitespace and provide a means of generating

-# output lines with trailing backslashes.

-# Allow XHASH to always be substituted, even in cases where XCOMM isn't.

-

-CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \

-                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \

-                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \

-                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \

-                       -e '/^[         ]*XHASH/s/XHASH/\#/' \

-                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \

-                       -e '/\@\@$$/s/\@\@$$/\\/'

-

-.pre:

-	@$(MKDIR_P) $(@D)

-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@

+#							-*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+SED = LC_CTYPE=C sed
+
+SUFFIXES += .pre
+
+WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+
+CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
+
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+
+CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
+                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
+                       -e '/\@\@$$/s/\@\@$$/\\/'
+
+.pre:
+	@$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@