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.

1 files changed, 19 insertions, 35 deletions

diff --git a/contrib/array/Makefile b/contrib/array/Makefile
index e0717f08461..61f12fcfc97 100644
--- a/contrib/array/Makefile
+++ b/contrib/array/Makefile
@@ -1,54 +1,38 @@
 #
-# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.11 2000/07/04 16:16:43 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.12 2000/07/09 13:12:59 petere Exp $
 #
 
-TOPDIR=../..
+subdir = contrib/array
+top_builddir = ../..
+include ../../src/Makefile.global
 
-include ../Makefile.global
-
-NAME	= array_iterator
-
-PROGRAM	= 
-OBJS	= $(NAME).o
-DOCS	= README.$(NAME)
-SQLS	= $(NAME).sql
-BINS	=
-EXAMPLES=
-MODS	= $(NAME)$(DLSUFFIX)
+NAME	:= array_iterator
+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: all installdirs
+	$(INSTALL_DATA) README.$(NAME)	$(docdir)/contrib
+	$(INSTALL_DATA) $(NAME).sql	$(datadir)/contrib
+	$(INSTALL_SHLIB) $(SONAME)	$(libdir)/contrib
 
-install_doc:
-	for inst_file in $(DOCS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
-	done
+installdirs:
+	$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)/contrib
 
-install_sql:
-	for inst_file in $(SQLS); do \
-		$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
-	done
-
-install_mod:
-	for inst_file in $(MODS); do \
-		$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
-	done
+uninstall:
+	rm -rf $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql $(libdir)/contrib/$(SONAME)
 
+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