mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring in changes to READLINE/HISTORY defines

Browse Source
This commit is contained in:
Marc G. Fournier 1996-08-20 05:04:13 +00:00
parent c801ca0982
commit 1bdbf4092a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile.global
View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.21 1996/08/19 13:50:41 scrappy Exp $
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.22 1996/08/20 05:04:06 scrappy Exp $
#
# NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To
@ -59,7 +59,7 @@
# until after this file is processed!
# make sure that you have no whitespaces after the PORTNAME setting
# or the makefiles can get confused
PORTNAME= svr4
PORTNAME= BSD44_derived
# SRCDIR specifies where the source files are.
SRCDIR= /home/tools/postgres95-1.02/src
@ -157,10 +157,12 @@ EUROPEAN_DATES = 1
USE_READLINE= true
# directories for the readline and history libraries.
READLINE_INCDIR= /home/tools/include
HISTORY_INCDIR= /home/tools/include -I/home/tools/include/readline
READLINE_LIBDIR= /home/tools/lib
HISTORY_LIBDIR= /home/tools/lib
READLINE_INCDIR= -I/home/tools/include
READLINE_LIBDIR= -L/home/tools/lib
# use the following if your readline has a separate history lib
#HISTORY_INCDIR= -I/home/tools/include -I/home/tools/include/readline
#HISTORY_LIBDIR= -L/home/tools/lib
# If you do not plan to use Host based authentication,
# comment out the following line

8
src/bin/psql/Makefile
View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4 1996/07/25 20:01:51 scrappy Exp $
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.5 1996/08/20 05:04:13 scrappy Exp $
#
#-------------------------------------------------------------------------
@ -22,7 +22,7 @@ include ../Makefile.global
#
ifeq ($(USE_READLINE), true)
CFLAGS += -I$(READLINE_INCDIR) -I$(HISTORY_INCDIR)
CFLAGS += $(READLINE_INC) $(HISTORY_INC)
# if you are using an older readline that uses #include "readline.h" instead
# of #include <readline/readline.h>,
@ -30,9 +30,7 @@ ifeq ($(USE_READLINE), true)
# CFLAGS += -DOLD_READLINE
LIBCURSES= -lcurses
LD_ADD += -L$(READLINE_LIBDIR) -L$(HISTORY_LIBDIR) -lreadline -lhistory $(LIBCURSES)
# use the following if your readline has no separate history lib
# LD_ADD += -L$(READLINE_LIBDIR) -lreadline $(LIBCURSES)
LD_ADD += $(READLINE_LIB) $(HISTORY_LIB) $(LIBCURSES)
ifeq ($(PORTNAME), ultrix4)
LD_ADD += -ltermcap