summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.custom0
-rw-r--r--src/Makefile.global11
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.custom b/src/Makefile.custom
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/src/Makefile.custom
+++ /dev/null
diff --git a/src/Makefile.global b/src/Makefile.global
index 5815c6cbc8a..c5fe5ed9432 100644
--- 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