diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-25 13:30:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-25 13:30:12 +0200 |
| commit | fef0571ebc8b51ef86bd41db5340531369567baf (patch) | |
| tree | 509ef47f8d1a19bde6ec805deecc68d845dba655 | |
| parent | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (diff) | |
| parent | c2dfa0e8c98b06e050c530d704d75a7e4edad02e (diff) | |
| download | vcxsrv-fef0571ebc8b51ef86bd41db5340531369567baf.tar.gz vcxsrv-fef0571ebc8b51ef86bd41db5340531369567baf.tar.bz2 vcxsrv-fef0571ebc8b51ef86bd41db5340531369567baf.zip | |
Merge remote-tracking branch 'origin/released'
| -rw-r--r-- | libX11/cpprules.in | 6 | ||||
| -rw-r--r-- | libX11/nls/Makefile.am | 6 |
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 |