2 files changed, 21 insertions, 39 deletions
diff --git a/contrib/fulltextindex/BENCH b/contrib/fulltextindex/BENCH
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/contrib/fulltextindex/BENCH
+++ /dev/null
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
index 0ab836c6013..cb76c19405a 100644
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
@@ -1,58 +1,40 @@
 #
-# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.6 2000/07/04 16:16:48 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.7 2000/07/09 13:13:07 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/fulltextindex
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= fti
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	= fti.pl
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= fti
+SONAME	:= $(NAME)$(DLSUFFIX)
 
 CFLAGS += -I. $(CFLAGS_SL)
 
-OTHER_CLEAN = $(SQLS)
-
-all: $(MODS) $(SQLS)
+all: $(SONAME) $(NAME).sql
 
-%.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
+$(NAME).sql: $(NAME).sql.in
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
 
-install: install_doc install_sql install_mod install_bin
+install: all installdirs
+	$(INSTALL_SCRIPT) fti.pl	$(bindir)
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(bindir) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
+uninstall:
+	rm -f $(bindir)/fti.pl $(libdir)/contrib/$(SONAME) \
+	  $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
 
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
-
-install_bin:
-	for inst_file in $(BINS); do \
-		$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
-	done
+clean distclean maintainer-clean:
+	rm -f $(SONAME) $(NAME).sql
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
 
-clean:
-	$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
-
 ifeq (depend,$(wildcard depend))
 include depend
 endif