Commitc64fb69

committed

Make update-unicode target work in vpath builds

1 parent23119d5 commitc64fb69Copy full SHA for c64fb69

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@ include $(top_builddir)/src/Makefile.global`
`27`	`27`	`include$(top_srcdir)/contrib/contrib-global.mk`
`28`	`28`	`endif`
`29`	`29`
`30`		`-update-unicode: unaccent.rules`
	`30`	`+update-unicode:$(srcdir)/unaccent.rules`
`31`	`31`
`32`	`32`	`# Allow running this even without --with-python`
`33`	`33`	`PYTHON ?= python`
`34`	`34`
`35`		`-unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml`
	`35`	`+$(srcdir)/unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml`
`36`	`36`	`$(PYTHON)$< --unicode-data-file$(word 2,$^) --latin-ascii-file$(word 3,$^)>$@`
`37`	`37`
`38`	`38`	`# Only download it once; dependencies must match src/common/unicode/`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,14 @@ subdir = src/common/unicode`
`12`	`12`	`top_builddir = ../../..`
`13`	`13`	`include$(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)`
	`15`	`+overrideCPPFLAGS := -DFRONTEND-I.$(CPPFLAGS)`
`16`	`16`	`LIBS +=$(PTHREAD_LIBS)`
`17`	`17`
`18`	`18`	`# By default, do nothing.`
`19`	`19`	`all:`
`20`	`20`
`21`	`21`	`update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_east_asian_fw_table.h unicode_normprops_table.h unicode_norm_hashfunc.h`
`22`		`-mv$^../../../src/include/common/`
	`22`	`+mv$^$(top_srcdir)/src/include/common/`
`23`	`23`	`$(MAKE) normalization-check`
`24`	`24`
`25`	`25`	`# These files are part of the Unicode Character Database. Download`
`@@ -33,7 +33,7 @@ UnicodeData.txt EastAsianWidth.txt DerivedNormalizationProps.txt CompositionExcl`
`33`	`33`	`unicode_norm_hashfunc.h: unicode_norm_table.h`
`34`	`34`
`35`	`35`	`unicode_norm_table.h: generate-unicode_norm_table.pl UnicodeData.txt CompositionExclusions.txt`
`36`		`-$(PERL)generate-unicode_norm_table.pl`
	`36`	`+$(PERL)$<`
`37`	`37`
`38`	`38`	`unicode_combining_table.h: generate-unicode_combining_table.pl UnicodeData.txt`
`39`	`39`	`$(PERL)$^>$@`
`@@ -58,7 +58,7 @@ submake-common:`
`58`	`58`	`$(MAKE) -C .. all`
`59`	`59`
`60`	`60`	`norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt`
`61`		`-perlgenerate-norm_test_table.pl NormalizationTest.txt$@`
	`61`	`+perl$^$@`
`62`	`62`
`63`	`63`	`.PHONY: normalization-check`
`64`	`64`

Comments

(0)