summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMarc G. Fournier1996-08-20 05:04:13 +0000
committerMarc G. Fournier1996-08-20 05:04:13 +0000
commit1bdbf4092ae9540d209b3bc221b479e778cba501 (patch)
tree066d624d824dcb44199e27ac40d67f48a792df87 /src/bin
parentc801ca098291f0f446b4ca1e1993d295f78e834a (diff)
Bring in changes to READLINE/HISTORY defines
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/psql/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 567eb79202c..5d632e4f37d 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -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