Bring the makefiles up to our conventions.

5 files changed, 19 insertions, 24 deletions

diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index 6df6bcf3ba5..d689df0f0ab 100644
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -1,10 +1,10 @@
+# $Header: /cvsroot/pgsql/contrib/tsearch2/Makefile,v 1.4 2003/08/23 04:25:28 petere Exp $
+
 subdir = contrib/tsearch2
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I$(srcdir) -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser $(CPPFLAGS)
-
 MODULE_big = tsearch2
 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
        dict_snowball.o dict_ispell.o dict_syn.o \
@@ -22,6 +22,9 @@ $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 $(SUBDIRS:%=%-recursive):
 	$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
 
+PG_CPPFLAGS = -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser
+
+DATA = stopword/english.stop stopword/russian.stop
 DATA_built = tsearch2.sql untsearch2.sql
 DOCS = README.tsearch2
 REGRESS = tsearch2
@@ -29,23 +32,18 @@ REGRESS = tsearch2
 EXTRA_CLEAN = tsearch2.sql.in
 
 SHLIB_LINK := -lm
-include $(top_srcdir)/contrib/contrib-global.mk
-# DO NOT DELETE
 
-install: installstop
-
-installstop:
-	cp $(srcdir)/stopword/*.stop $(datadir)
-
-
-tsearch2.sql.in: tsearch.sql._in
-	sed 's,DATA_PATH,$(datadir),g' < $< > $@
+tsearch2.sql: tsearch.sql.in
+	sed -e 's,MODULE_PATHNAME,$$libdir/$*,g' \
+	    -e 's,DATA_PATH,$(datadir)/contrib,g' $< >$@
 
 untsearch2.sql: untsearch.sql.in
 	cp $< $@
 
+.PHONY: subclean
 clean: subclean
 
 subclean:
 	for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done
  
+include $(top_srcdir)/contrib/contrib-global.mk
diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile
index 5532359b1cf..fcc61a2c583 100644
--- a/contrib/tsearch2/ispell/Makefile
+++ b/contrib/tsearch2/ispell/Makefile
@@ -1,9 +1,11 @@
+# $Header: /cvsroot/pgsql/contrib/tsearch2/ispell/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
+
 subdir = contrib/tsearch2/ispell
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
+PG_CPPFLAGS = -I$(srcdir)/.. $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 SUBOBJS = spell.o 
@@ -16,6 +18,3 @@ SUBSYS.o: $(SUBOBJS)
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
 include $(top_srcdir)/contrib/contrib-global.mk
-# DO NOT DELETE
-
-
diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile
index 156b1b3d399..442b1b3b75b 100644
--- a/contrib/tsearch2/snowball/Makefile
+++ b/contrib/tsearch2/snowball/Makefile
@@ -1,9 +1,11 @@
+# $Header: /cvsroot/pgsql/contrib/tsearch2/snowball/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
+
 subdir = contrib/tsearch2/snowball
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
+PG_CPPFLAGS = -I$(srcdir)/..
 override CFLAGS += $(CFLAGS_SL)
 
 SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
@@ -16,6 +18,3 @@ SUBSYS.o: $(SUBOBJS)
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
 include $(top_srcdir)/contrib/contrib-global.mk
-# DO NOT DELETE
-
-
diff --git a/contrib/tsearch2/tsearch.sql._in b/contrib/tsearch2/tsearch.sql.in
index de75a5bc649..de75a5bc649 100644
--- a/contrib/tsearch2/tsearch.sql._in
+++ b/contrib/tsearch2/tsearch.sql.in
diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile
index 56d476525f5..d1703fd78a6 100644
--- a/contrib/tsearch2/wordparser/Makefile
+++ b/contrib/tsearch2/wordparser/Makefile
@@ -1,9 +1,11 @@
+# $Header: /cvsroot/pgsql/contrib/tsearch2/wordparser/Attic/Makefile,v 1.4 2003/08/23 04:25:29 petere Exp $
+
 subdir = contrib/tsearch2/wordparser
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
+PG_CPPFLAGS = -I$(srcdir)/..
 override CFLAGS += $(CFLAGS_SL)
 
 SUBOBJS =  parser.o deflex.o
@@ -23,6 +25,3 @@ SUBSYS.o: $(SUBOBJS)
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
 
 include $(top_srcdir)/contrib/contrib-global.mk
-# DO NOT DELETE
-
-