Furthre cleanup of -lreadline/-lhistory

scrappy · scrappy · commit 4db04d77790c · 1996-08-20T04:02:01.000Z
diff --git 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,17 +22,15 @@ 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>,
 # uncomment this
 # 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

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/bin/psql/Makefile,v 1.4.2.2 1996/08/19 19:36:01 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4.2.3 1996/08/20 04:02:01 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -22,17 +22,15 @@ include ../Makefile.global`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`ifeq ($(USE_READLINE), true)`
`25`		`- CFLAGS += -I$(READLINE_INCDIR) -I$(HISTORY_INCDIR)`
	`25`	`+ CFLAGS += $(READLINE_INCDIR) $(HISTORY_INCDIR)`
`26`	`26`
`27`	`27`	`# if you are using an older readline that uses #include "readline.h" instead`
`28`	`28`	`# of #include <readline/readline.h>,`
`29`	`29`	`# uncomment this`
`30`	`30`	`# CFLAGS += -DOLD_READLINE`
`31`	`31`
`32`	`32`	`LIBCURSES= -lcurses`
`33`		`- LD_ADD += -L$(READLINE_LIB) -L$(HISTORY_LIB) $(LIBCURSES)`
`34`		`-# use the following if your readline has no separate history lib`
`35`		`-# LD_ADD += -L$(READLINE_LIBDIR) -lreadline $(LIBCURSES)`
	`33`	`+ LD_ADD += $(READLINE_LIB) $(HISTORY_LIB) $(LIBCURSES)`
`36`	`34`
`37`	`35`	`ifeq ($(PORTNAME), ultrix4)`
`38`	`36`	`LD_ADD += -ltermcap`