aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-25 13:29:28 +0200
committermarha <marha@users.sourceforge.net>2014-05-25 13:29:28 +0200
commitc2dfa0e8c98b06e050c530d704d75a7e4edad02e (patch)
tree724551e1fa148c2e72506bb249be6f73e4b94b5a
parent63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff)
downloadvcxsrv-c2dfa0e8c98b06e050c530d704d75a7e4edad02e.tar.gz
vcxsrv-c2dfa0e8c98b06e050c530d704d75a7e4edad02e.tar.bz2
vcxsrv-c2dfa0e8c98b06e050c530d704d75a7e4edad02e.zip
libX11 git update 25 May 2014
libX11 commit c6bc28d433243c32b3f74955f1478451b4fd27b5
-rw-r--r--libX11/cpprules.in6
-rw-r--r--libX11/nls/Makefile.am6
2 files changed, 6 insertions, 6 deletions
diff --git a/libX11/cpprules.in b/libX11/cpprules.in
index e1296c699..03d6701e5 100644
--- a/libX11/cpprules.in
+++ b/libX11/cpprules.in
@@ -19,9 +19,9 @@ CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
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 '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
+ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+ -e '/^[ ]*XHASH/s/XHASH/\#/' \
-e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
-e '/\@\@$$/s/\@\@$$/\\/'
diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index 53eaacdf6..0c544f6cf 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -20,19 +20,19 @@ include $(top_srcdir)/cpprules.in
locale.alias: locale.alias.pre
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
- $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
< locale.alias.l1 > locale.alias.l2
cat locale.alias.l2 locale.alias.l1 > locale.alias
compose.dir: compose.dir.pre
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
- $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
< compose.dir.l1 > compose.dir.l2
cat compose.dir.l2 compose.dir.l1 > compose.dir
locale.dir: locale.dir.pre
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
- $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
+ $(SED) -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \
< locale.dir.l1 > locale.dir.l2
cat locale.dir.l2 locale.dir.l1 > locale.dir