From 58413fd9fccc96cc2c67e8fa1bf1cfd5de9bbbb5 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Mon, 11 Nov 1996 12:19:05 +0000
Subject: [PATCH] ----- |After sending my previous changes I found one more
 thing in Makefile.global. |Any tests should be done after including
 Makefile.custom or else there |won't be anything, particularly the port name,
 to base the tests on. | -----

more changes to makefile.global from D'Arcy
---
 src/Makefile.global | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.global b/src/Makefile.global
index 7717224e9e..c963f082ba 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.60 1996/11/11 03:12:00 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.61 1996/11/11 12:19:05 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -236,16 +236,6 @@ X11_LIB = -lX11 -lsocket -lnsl
 
 YFLAGS = -d
 
-##############################################################################
-#
-#  AR
-
-ifneq (,$(findstring /$(PORTNAME)/, /BSD44_derived/bsdi/sparc/))
-  AROPT = cq
-else
-  AROPT = crs
-endif
-
 ##############################################################################
 #
 # Installation. 
@@ -303,6 +293,16 @@ endif
 # Since there are no longer separate files for each platform, much of the
 # commonality among the platforms ought to be factored out of the following.
 
+##############################################################################
+#
+#  AR
+
+ifneq (,$(findstring /$(PORTNAME)/, /BSD44_derived/bsdi/sparc/))
+  AROPT = cq
+else
+  AROPT = crs
+endif
+
 #----------------------------------------------------------------------
 ifeq ($PORTNAME, BSD44_derived)
 MK_PORT=	BSD44_derived
@@ -855,7 +855,8 @@ srcdir=		$(SRCDIR)
 includedir=	$(HEADERDIR)
 
 
-# This goes here so that customization in Makefile.custom is effective
+# This goes here so that customizations in Makefile.custom and port
+# specific changes above are effective
 ##############################################################################
 #
 # Flags for CC and LD. (depend on COPT and PROFILE)
@@ -894,3 +895,7 @@ CFLAGS+= $(CFLAGS_BE)
 LDADD+= $(LDADD_BE)
 LDFLAGS+= $(LDFLAGS_BE)
 
+ifeq ($(USE_READLINE), false)
+CFLAGS += -DNOREADLINE
+endif
+