hstore_plpython: Fix regression tests under Python 3

[postgresql] / contrib / unaccent / Makefile

diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index 36415fef77df8450d0d548167ed6725100f9b7f7..bc93e6f8dd2ff0d67245521d2a40a872e49f2839 100644 (file)
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -1,15 +1,18 @@
 # contrib/unaccent/Makefile
 
 MODULE_big = unaccent
-OBJS = unaccent.o
+OBJS = unaccent.o $(WIN32RES)
 
-DATA_built = unaccent.sql
-DATA = uninstall_unaccent.sql
+EXTENSION = unaccent
+DATA = unaccent--1.0.sql unaccent--unpackaged--1.0.sql
 DATA_TSEARCH = unaccent.rules
+PGFILEDESC = "unaccent - text search dictionary that removes accents"
+
 REGRESS = unaccent
 
-# Adjust REGRESS_OPTS because we need a UTF8 database
-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale 
+# We need a UTF8 database
+ENCODING = UTF8
+NO_LOCALE = 1
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config