postgrespro
diff --git a/‎src/Makefile.custom‎ b/‎src/Makefile.custom‎
diff --git a/‎src/Makefile.global‎
Lines changed: 5 additions & 6 deletions b/‎src/Makefile.global‎
Lines changed: 5 additions & 6 deletions
@@ -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
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.13 1996/07/25 00:30:02 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.14 1996/07/25 07:26:37 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# This is seen by any Makefiles that include mk/postgres.mk. To`
`@@ -63,10 +63,6 @@ PORTNAME= BSD44_derived`
`63`	`63`	`# SRCDIR specifies where the source files are.`
`64`	`64`	`SRCDIR= /home/staff/scrappy/cvs/postgres95/src`
`65`	`65`
`66`		`-# FreeBSD 2.1R with new Flex v2.5.2 in /usr/local`
`67`		`-LEX = flex`
`68`		`-LDADD+= -L/usr/local/lib -lfl`
`69`		`-`
`70`	`66`	`# POSTGRESLOGIN is the login name of the user who gets special`
`71`	`67`	`# privileges within the database. By default it is "postgres", but`
`72`	`68`	`# 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`
`224`	`220`	`TK_LIBDIR= /usr/local/devel/tk4.0/lib`
`225`	`221`	`TK_LIB = -ltk4.0`
`226`	`222`
	`223`	`+X11_INCDIR = /usr/X11R6.1/include`
	`224`	`+X11_LIBDIR = /usr/X11R6.1/lib`
	`225`	`+X11_LIB = -lX11`
	`226`	`+`
`227`	`227`	`#`
`228`	`228`	`# include port specific rules and variables. For instance:`
`229`	`229`	`#`
`@@ -315,4 +315,3 @@ objdir= obj`
`315`	`315`	`#`
`316`	`316`	`# Customization.`
`317`	`317`	`#`
`318`		`--include $(MKDIR)/../Makefile.custom`