aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-04-19 22:52:52 +0300
committerPeter Eisentraut <peter_e@gmx.net>2011-04-19 22:52:52 +0300
commit385942f46ce526000d231c51c76360a807c2f809 (patch)
tree34e14810e726f9728ff3af5e23899c2b8dc2273b /contrib
parent2e8d9544752a7d68cb46f028a4f16ab0eb76c26e (diff)
downloadpostgresql-385942f46ce526000d231c51c76360a807c2f809.tar.gz
postgresql-385942f46ce526000d231c51c76360a807c2f809.zip
Refix the unaccent regression test on MSVC properly
... for some value of "properly". Instead of overriding REGRESS_OPTS, set the variables ENCODING and NO_LOCALE, which is more expressive and allows overriding by the user. Fix vcregress.pl to handle that.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/unaccent/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index 4ee2c685c85..f0be62db53f 100644
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -9,8 +9,9 @@ DATA_TSEARCH = unaccent.rules
REGRESS = unaccent
-# Adjust REGRESS_OPTS because we need a UTF8 database
-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --encoding=UTF8 --no-locale
+# We need a UTF8 database
+ENCODING = UTF8
+NO_LOCALE = 1
ifdef USE_PGXS
PG_CONFIG = pg_config