Dr George suggested removing Makefile.custom altogether, to reduce

any confusion...so its gone...

diff --git a/src/Makefile.custom b/src/Makefile.custom
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/Makefile.global b/src/Makefile.global
index 5815c6cbc8a814b371bc4aae37a5b7bad99a8938..c5fe5ed94325008244e6b4c0a5d0b4a18265168b 100644 (file)
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.13 1996/07/25 00:30:02 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.14 1996/07/25 07:26:37 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -63,10 +63,6 @@ PORTNAME=    BSD44_derived
 # SRCDIR specifies where the source files are.
 SRCDIR=                /home/staff/scrappy/cvs/postgres95/src
 
-# FreeBSD 2.1R with new Flex v2.5.2 in /usr/local
-LEX = flex
-LDADD+= -L/usr/local/lib -lfl
-
 # POSTGRESLOGIN is the login name of the user who gets special
 # privileges within the database.  By default it is "postgres", but
 # you can change it to any existing login name (such as your own 
@@ -224,6 +220,10 @@ TK_INCDIR=  /usr/local/devel/tk4.0/include
 TK_LIBDIR=  /usr/local/devel/tk4.0/lib
 TK_LIB = -ltk4.0
 
+X11_INCDIR = /usr/X11R6.1/include
+X11_LIBDIR = /usr/X11R6.1/lib
+X11_LIB = -lX11
+
 #
 # include port specific rules and variables. For instance:
 #
@@ -315,4 +315,3 @@ objdir=             obj
 #
 # Customization.
 #
--include $(MKDIR)/../Makefile.custom