aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-10 18:09:47 +0000
committermarha <marha@users.sourceforge.net>2010-10-10 18:09:47 +0000
commit4532155ca4105db6ebd49ba6e31fbb5c869c409f (patch)
tree02c68561bd2df7203d7d4794546668a6406285c4
parentc8e5c7582ea4cc70d3efa1e66daff6a11fb93faa (diff)
parentca01727646bcc035a36b90f2a2a38b3dd9ce8c93 (diff)
downloadvcxsrv-4532155ca4105db6ebd49ba6e31fbb5c869c409f.tar.gz
vcxsrv-4532155ca4105db6ebd49ba6e31fbb5c869c409f.tar.bz2
vcxsrv-4532155ca4105db6ebd49ba6e31fbb5c869c409f.zip
svn merge ^/branches/released .
-rw-r--r--libX11/cpprules.in1
-rw-r--r--libX11/nls/Makefile.am14
2 files changed, 4 insertions, 11 deletions
diff --git a/libX11/cpprules.in b/libX11/cpprules.in
index 6640bbfd9..723560c1c 100644
--- a/libX11/cpprules.in
+++ b/libX11/cpprules.in
@@ -26,4 +26,5 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/\@\@$$/s/\@\@$$/\\/'
.pre:
+ @$(MKDIR_P) $(@D)
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index 4c7f57797..cf7971ff7 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -1,3 +1,4 @@
+
x11localedir = $(X11_LOCALEDATADIR)
specdir = $(docdir)/Compose
@@ -101,13 +102,11 @@ locale.dir: locale.dir.pre
if HAVE_PERL
doc_sources = Compose/index.xml
-Compose/index.xml: Compose
+Compose/index.xml:
+ @$(MKDIR_P) $(@D)
$(AM_V_GEN)$(PERL) $(srcdir)/compose-chart.pl \
--index --output="$@" $(locales)
-Compose:
- $(MKDIR_P) $@
-
clean-local: clean-Compose-dir
clean-Compose-dir:
-rm -rf Compose
@@ -122,11 +121,6 @@ nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose)
EXTRA_DIST += $(nobase_x11locale_DATA:%=%.pre)
CLEANFILES += $(nobase_x11locale_DATA)
-$(nobase_x11locale_DATA): builddirs
-
-builddirs:
- $(MKDIR_P) $(locales)
-
if HAVE_PERL
TESTS_ENVIRONMENT = $(PERL)
TESTS = $(srcdir)/compose-check.pl
@@ -144,6 +138,4 @@ XMLTO_FLAGS += -o $(@D)
Compose/%.xml: %/Compose.xml
$(AM_V_GEN)cp $< $@
-$(doc_sources): Compose
-
endif HAVE_PERL