Another round of those unportable config/build changes :-/

* Add option to build with OpenSSL out of the box. Fix thusly exposed
  bit rot. Although it compiles now, getting this to do something
  useful is left as an exercise.

* Fix Kerberos options to defer checking for required libraries until
  all the other libraries are checked for.

* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.

* Install work around for Autoconf's install-sh relative path anomaly.
  Get rid of old INSTL_*_OPTS variables, now that we don't need them
  anymore.

* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.

* Look for only one of readline.h or readline/readline.h, not both.

* Make check for PS_STRINGS cacheable. Don't test for the header files
  separately.

* Disable fcntl(F_SETLK) test on Linux.

* Substitute the standard GCC warnings set into CFLAGS in configure,
  don't add it on in Makefile.global.

* Sweep through contrib tree to teach makefiles standard semantics.

... and in completely unrelated news:

* Make postmaster.opts arbitrary options-aware. I still think we need to
  save the environment as well.

2 files changed, 22 insertions, 33 deletions

diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 9a6ca052975..60bc2e6dbf3 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,19 +1,15 @@
 #
-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.16 2000/07/04 16:17:11 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.17 2000/07/09 13:13:36 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/spi
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= 
-
-PROGRAM	= 
 OBJS	= autoinc.o insert_username.o moddatetime.o refint.o timetravel.o
 DOCS	= README.spi
 SQLS	= $(OBJS:.o=.sql)
-BINS	=
-EXAMPLES= $(OBJS:.o=.example) new_example.example
+EXAMPLES= $(OBJS:.o=.example)
 MODS	= $(OBJS:.o=$(DLSUFFIX))
 
 CFLAGS += -I. $(CFLAGS_SL)
@@ -22,43 +18,36 @@ ifdef REFINT_VERBOSE
 CFLAGS+= -DREFINT_VERBOSE
 endif
 
-OTHER_CLEAN = $(SQLS)
-
 all: $(MODS) $(SQLS)
 
 %.sql: %.sql.in
-	$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@
-
-install: install_doc install_sql install_mod install_example
+	sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
-
-install_sql:
+install: all installdirs
 	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
+	    $(INSTALL_DATA) $$inst_file $(datadir)/contrib || exit; \
 	done
-
-install_mod:
 	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
+	    $(INSTALL_SHLIB) $$inst_file $(libdir)/contrib || exit; \
 	done
-
-install_example:
-	for inst_file in $(EXAMPLES); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_EXAMPLESDIR); \
+	for inst_file in $(EXAMPLES) README.spi; do \
+	    $(INSTALL_DATA) $$inst_file $(docdir)/contrib/spi || exit; \
 	done
 
+installdirs:
+	$(mkinstalldirs) $(datadir)/contrib $(libdir)/contrib $(docdir)/contrib/spi
+
+uninstall:
+	rm -f $(addprefix $(datadir)/contrib/, $(SQLS)) \
+	  $(addprefix $(libdir)/contrib/, $(MODS)) \
+	  $(addprefix $(docdir)/contrib/spi/, $(EXAMPLES) README.spi)
+
+clean distclean maintainer-clean:
+	rm -f $(MODS) $(SQLS) $(OBJS)
+
 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
-
-
diff --git a/contrib/spi/new_example.sql b/contrib/spi/new_example.sql
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/contrib/spi/new_example.sql
+++ /dev/null