Rename the uninstall scripts for contrib/lo and contrib/tsearch2 to

match the convention that foo's uninstall script is uninstall_foo.sql.
Also, stop installing lo_test.sql, which really ought to be made into
a regression test anyway (though it's unclear how to avoid a dependency
on the current OID counter...)

diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index c9a6bec..0cf642a 100644 (file)
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,8 +1,8 @@
-# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.14 2005/09/27 17:13:04 tgl Exp $
+# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.15 2006/09/11 15:14:46 tgl Exp $
 
 MODULES = lo
 DATA_built = lo.sql
-DATA = lo_drop.sql lo_test.sql
+DATA = uninstall_lo.sql
 DOCS = README.lo
 
 ifdef USE_PGXS

diff --git a/contrib/lo/lo_drop.sql b/contrib/lo/uninstall_lo.sql
similarity index 100%
rename from contrib/lo/lo_drop.sql
rename to contrib/lo/uninstall_lo.sql

diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index c529f2b..3694974 100644 (file)
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.16 2006/07/15 03:33:14 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.17 2006/09/11 15:14:46 tgl Exp $
 
 MODULE_big = tsearch2
 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
@@ -17,7 +17,7 @@ OBJS  += $(SUBDIROBJS)
 PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser
 
 DATA = stopword/english.stop stopword/russian.stop stopword/russian.stop.utf8 thesaurus
-DATA_built = tsearch2.sql untsearch2.sql
+DATA_built = tsearch2.sql uninstall_tsearch2.sql
 DOCS = README.tsearch2
 REGRESS = tsearch2
 
@@ -45,7 +45,7 @@ $(SUBDIRS:%=%-recursive):
 tsearch2.sql: tsearch.sql.in
        sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@
 
-untsearch2.sql: untsearch.sql.in
+uninstall_tsearch2.sql: untsearch.sql.in
        cp $< $@
 
 .PHONY: subclean