Fix relative path references so that make knowns which dependencies refer

to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.

Author: petere

GNUmakefile.in

@@ -1,12 +1,12 @@
 #
 # PostgreSQL top level makefile
 #
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.10 2000/08/20 15:55:15 petere Exp $
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.11 2000/08/31 16:08:58 petere Exp $
 #
 
 subdir =
 top_builddir = .
-include src/Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 all:
 	$(MAKE) -C doc all

contrib/findoidjoins/Makefile

@@ -1,13 +1,13 @@
 #
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.9 2000/08/31 16:08:59 petere Exp $
 #
 
 subdir = contrib/findoidjoins
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CFLAGS	+= -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
-LIBS	+= $(LIBPGEASY)
+CFLAGS	+= -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
+LIBS	+= $(libpgeasy)
 
 all: findoidjoins
 

contrib/mSQL-interface/Makefile

@@ -1,17 +1,17 @@
 #
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.5 2000/08/31 16:09:00 petere Exp $
 #
 
 subdir = contrib/mSQL-interface
 top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
 
 NAME	:= mpgsql
 SO_MAJOR_VERSION := 0
 SO_MINOR_VERSION := 0
 OBJS	:= mpgsql.o
 
-CFLAGS	+= -I$(LIBPQDIR)
+CFLAGS	+= -I$(libpq_srcdir)
 
 include $(top_srcdir)/src/Makefile.shlib
 

contrib/odbc/Makefile

@@ -1,9 +1,9 @@
 # ODBC extensions
 # Thomas Lockhart 2000-04-03
 
-SRCDIR= ../../src
-
-include $(SRCDIR)/Makefile.global
+subdir = contrib/odbc
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
 
 ifndef PGLIB
   PGLIB= .

contrib/pg_dumplo/Makefile

@@ -1,18 +1,18 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.6 2000/08/31 16:09:05 petere Exp $
 #
 
 subdir = contrib/pg_dumplo
 top_builddir = ../..
 include ../../src/Makefile.global
 
 OBJS	= main.o lo_export.o lo_import.o utils.o
-CFLAGS += -I$(LIBPQDIR)
+CFLAGS += -I$(libpq_srcdir)
 
 all: pg_dumplo
 
-pg_dumplo: $(OBJS) $(LIBPQDIR)/libpq.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) 
+pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq)
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_dumplo$(X)	$(bindir)

contrib/pgbench/Makefile

@@ -1,13 +1,13 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.6 2000/08/31 16:09:09 petere Exp $
 #
 
 subdir = contrib/pgbench
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CFLAGS	+= -I$(LIBPQDIR)
-LIBS	+= $(LIBPQ)
+CFLAGS	+= -I$(libpq_srcdir)
+LIBS	+= $(libpq)
 
 all: pgbench
 

contrib/vacuumlo/Makefile

@@ -1,13 +1,13 @@
 #
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.7 2000/08/31 16:09:12 petere Exp $
 #
 
 subdir = contrib/vacuumlo
 top_builddir = ../..
 include ../../src/Makefile.global
 
-CPPFLAGS += -I$(LIBPQDIR)
-LIBS += $(LIBPQ)
+CPPFLAGS += -I$(libpq_srcdir)
+LIBS += $(libpq)
 
 all: vacuumlo
 

doc/src/Makefile

@@ -1,21 +1,14 @@
 # Postgres documentation makefile
-# Thomas Lockhart
+# $Header: /cvsroot/pgsql/doc/src/Makefile,v 1.11 2000/08/31 16:09:16 petere Exp $
 
-# Not yet generated from configure, so use relative path names for now...
-PGDOCS= ..
-SRCDIR= ../../src
+subdir = doc/src
+top_builddir = ../..
+-include $(top_builddir)/src/Makefile.global
 
 TAR= tar
 ZIP= gzip
 TAREXCLUDE= --exclude=Makefile --exclude='*.sgml' --exclude=ref
 
-# Pick up Makefile.global from the source area
-# This is the only resource from the code source area and is optional
-
-ifneq ($(wildcard $(SRCDIR)/Makefile.global), )
-include $(SRCDIR)/Makefile.global
-endif
-
 SRC= admin postgres programmer tutorial user
 
 TARGETS= $(SRC:%=%.tar.gz)
@@ -80,5 +73,4 @@ man.tar:
 # Compressed file
 
 %.gz:	%
-	($(ZIP) -f $<)
-
+	$(GZIP) -f $<

doc/src/sgml/Makefile

@@ -8,12 +8,17 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.18 2000/08/26 13:08:14 petere Exp $
+#    $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.19 2000/08/31 16:09:20 petere Exp $
 #
 #----------------------------------------------------------------------------
 
-PGDOCS= ../..
-SRCDIR= ../../../src
+# Pick up Makefile.global from the source area
+# This is the only resource from the code source area and is optional.
+# Actually, we want this to get Makefile.custom - thomas 1998-03-01
+subdir = doc/src/sgml
+top_builddir = ../../..
+-include $(top_builddir)/src/Makefile.global
+
 
 # This is where the default stylesheets appear on my linux system.
 # Probably no need to change this; rather, put definitions
@@ -46,14 +51,6 @@ D2MSCRIPT= $(D2MDIR)/docbook2man-spec.pl
 
 TAR= tar
 
-# Pick up Makefile.global from the source area
-# This is the only resource from the code source area and is optional.
-# Actually, we want this to get Makefile.custom - thomas 1998-03-01
-
-ifneq ($(wildcard $(SRCDIR)/Makefile.global),)
-  include $(SRCDIR)/Makefile.global
-endif
-
 # Hmm, made this optional but jade _really_ doesn't like them missing
 # - thomas 1998-03-01
 ifneq ($(HDSL), )

src/Makefile.global.in

@@ -1,51 +1,20 @@
-#----------------------------------------------------------------------------
-#
-# Makefile.global--
-#    global configuration for the Makefiles
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.91 2000/08/28 11:53:14 petere Exp $
-#
-# NOTES
-#    Essentially all Postgres make files include this file and use the
-#    variables it sets.
-#
-#    To override the default setting, create a Makefile.custom in this
-#    directory and put your defines there. (Makefile.custom is included
-#    near the end of this file).  Sometimes, a variable gets set in
-#    Makefile.global after Makefile.custom has been included, so you can't
-#    simply set that variable in Makefile.custom.  In those cases, there is
-#    often another variable (like CUSTOM_COPT) that you can set in
-#    Makefile.custom that influences the later setting of the true variable
-#    of interest (like CFLAGS) by Makefile.global.
-#
-#
-#    If you change any of these defines you probably have to
-#       make clean; make
-#    since no dependencies are created for these. (of course you can
-#    be crafty and check what files really depend on them and just remake
-#    those).
-#
-#    Before including this file, you must set the SRCDIR variable to the
-#    path of the top of the Postgres source tree (the directory that
-#    contains this file).
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.92 2000/08/31 16:09:22 petere Exp $
+
+#------------------------------------------------------------------------------
+# All PostgreSQL makefiles include this file and use the variables it sets,
+# which in turn are put here by the configure script. There is no need for
+# users to edit this file -- if it turns out to be necessary then that's a
+# bug.
 #
-#-------------------------------------------------------------------------
+# A makefile that includes this file needs to set the variable `subdir' to
+# the relative path from the top to itself and `top_builddir' to the relative
+# path from itself to the top before including this file. (The "top" is the
+# parent directory of the directory this file is in.)
+#------------------------------------------------------------------------------
 
 # PostgreSQL version number
 VERSION = @VERSION@
 
-ifndef top_builddir
-top_builddir = $(SRCDIR)/..
-endif
-
-ifndef SRCDIR
-SRCDIR = $(top_builddir)/src
-endif
-
 # This should be changed once we have separate build dirs.
 top_srcdir = $(top_builddir)
 
@@ -73,13 +42,14 @@ BSD_SHLIB= true
 # systems now.  May be applicable to other systems to?
 ELF_SYSTEM= @ELF_SYS@
 
-LIBPQDIR= $(SRCDIR)/interfaces/libpq
-LIBPGEASYDIR= $(SRCDIR)/interfaces/libpgeasy
-LIBPGTCLDIR= $(SRCDIR)/interfaces/libpgtcl
+libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
+libpq_builddir = $(top_builddir)/src/interfaces/libpq
+libpq = -L$(libpq_builddir) -lpq
+
+libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
+libpgeasy_builddir = $(top_builddir/src/interfaces/libpgeasy
+libpgeasy = -L$(libpgeasy_builddir) -lpgeasy
 
-LIBPQ= -L$(LIBPQDIR) -lpq
-LIBPGTCL= -L$(LIBPGTCLDIR) -lpgtcl
-LIBPGEASY= -L$(LIBPGEASYDIR) -lpgeasy
 
 # installation directories
 
@@ -99,16 +69,6 @@ docdir = @docdir@
 
 odbcinst_ini_dir = @odbcinst_ini_dir@
 
-# old variable names for installation directories
-
-POSTGRESDIR= $(prefix)
-BINDIR= $(bindir)
-LIBDIR= $(libdir)
-TEMPLATEDIR= $(libdir)
-POSTMANDIR= $(mandir)
-POSTDOCDIR= $(docdir)
-HEADERDIR= $(includedir)
-
 
 ##############################################################################
 #
@@ -117,10 +77,6 @@ HEADERDIR= $(includedir)
 # To disable a feature, comment out the entire definition
 # (that is, prepend '#', don't set it to "0" or "no").
 
-# Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to
-# multi-byte types to generate a bus error.
-ENFORCE_ALIGNMENT= true
-
 # Comment out PROFILE to generate a profile version of the binaries
 #PROFILE= -p -non_shared
 
@@ -156,7 +112,6 @@ MULTIBYTE=@MULTIBYTE@
 #
 # Installation.
 #
-# For many ports, INSTALL is overridden below.
 INSTALL= @INSTALL@
 
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,7 +135,7 @@ FLEX = @FLEX@
 FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
 AROPT= @AROPT@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = -I$(SRCDIR)/include $(CPPFLAGS) @CFLAGS@
+CFLAGS = -I$(top_srcdir)/src/include $(CPPFLAGS) @CFLAGS@
 CFLAGS_SL= @SHARED_LIB@
 LIBS= @LIBS@
 LDFLAGS= @LDFLAGS@ $(LIBS)
@@ -210,7 +165,7 @@ CPU= @CPU@
 HAVE_POSIX_SIGNALS= @HAVE_POSIX_SIGNALS@
 HPUXMATHLIB= @HPUXMATHLIB@
 
-include $(SRCDIR)/Makefile.port
+include $(top_builddir)/src/Makefile.port
 
 ##############################################################################
 #
@@ -219,9 +174,7 @@ include $(SRCDIR)/Makefile.port
 # This includes your local customizations if Makefile.custom exists
 # in the source directory.  This file doesn't exist in the original
 # distribution so that it doesn't get overwritten when you upgrade.
-ifneq ($(wildcard $(SRCDIR)/Makefile.custom), )
-include $(SRCDIR)/Makefile.custom
-endif
+-include $(top_srcdir)/src/Makefile.custom
 
 # This goes here so that customization in Makefile.custom is effective
 ##############################################################################