summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1996-08-20 04:02:01 +0000
committerMarc G. Fournier <scrappy@hub.org>1996-08-20 04:02:01 +0000
commit4db04d77790caf8be989bb3b6a8735d61e0603cf (patch)
treec3b3c81ebe3c07694eccba69022efdac70ba312d
parent8288f6afd0c9dc9c9caf15f2618efe36c740c7cc (diff)
Furthre cleanup of -lreadline/-lhistory
-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 9f1d2208eb6..669e51ed591 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.2.2 1996/08/19 19:36:01 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4.2.3 1996/08/20 04:02:01 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -22,7 +22,7 @@ include ../Makefile.global
#
ifeq ($(USE_READLINE), true)
- CFLAGS += -I$(READLINE_INCDIR) -I$(HISTORY_INCDIR)
+ CFLAGS += $(READLINE_INCDIR) $(HISTORY_INCDIR)
# 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_LIB) -L$(HISTORY_LIB) $(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