From ca01727646bcc035a36b90f2a2a38b3dd9ce8c93 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 10 Oct 2010 17:54:05 +0000 Subject: libX11 update 10/10/2010 --- libX11/cpprules.in | 1 + libX11/nls/Makefile.am | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'libX11') 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 -- cgit v1.2.3