From 424f0edcb8d73446223f1812d3ca88150e1cc953 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 31 Aug 2000 16:12:35 +0000
Subject: 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.

---
 doc/src/Makefile      | 18 +++++-------------
 doc/src/sgml/Makefile | 19 ++++++++-----------
 2 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'doc')

diff --git a/doc/src/Makefile b/doc/src/Makefile
index 38471a1193..3b7e52e607 100644
--- a/doc/src/Makefile
+++ b/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 $<
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index fd4af31252..d61691f277 100644
--- a/doc/src/sgml/Makefile
+++ b/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), )
-- 
cgit v1.2.1