diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-04-19 14:59:29 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-04-19 14:59:29 +0200 |
| commit | 73afabcdc20e227beb8094efb44753b4de1c5c0a (patch) | |
| tree | b05d53eeb3debfdf50705b5ca71f507d8b54d225 /src | |
| parent | 00f4aba46d537452da41e6d398f8f4c915de586d (diff) | |
| download | postgresql-73afabcdc20e227beb8094efb44753b4de1c5c0a.tar.gz postgresql-73afabcdc20e227beb8094efb44753b4de1c5c0a.zip | |
Fix update-unicode target
The normalization-check target needs to be run last, after moving the
newly generated files into place. Also, we need an additional
dependency so that unicode_norm.o is rebuilt first. Otherwise,
norm_test will still test the old files but against the new expected
results, which will probably fail.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/unicode/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/common/unicode/Makefile b/src/common/unicode/Makefile index 7a37ec7b55a..93a9d1615f1 100644 --- a/src/common/unicode/Makefile +++ b/src/common/unicode/Makefile @@ -19,8 +19,8 @@ LIBS += $(PTHREAD_LIBS) all: update-unicode: unicode_norm_table.h unicode_combining_table.h unicode_normprops_table.h - $(MAKE) normalization-check mv $^ ../../../src/include/common/ + $(MAKE) normalization-check # These files are part of the Unicode Character Database. Download # them on demand. The dependency on Makefile.global is for @@ -43,10 +43,15 @@ unicode_normprops_table.h: generate-unicode_normprops_table.pl DerivedNormalizat normalization-check: norm_test ./norm_test -norm_test: norm_test.o ../unicode_norm.o +norm_test: norm_test.o ../unicode_norm.o | submake-common norm_test.o: norm_test_table.h +.PHONY: submake-common + +submake-common: + $(MAKE) -C .. all + norm_test_table.h: generate-norm_test_table.pl NormalizationTest.txt perl generate-norm_test_table.pl NormalizationTest.txt $@ |