FreeBSD has libreadline,but not libhistory...

scrappy · scrappy · commit e93ad5392e6c · 1996-08-19T19:32:58.000Z
Change Makefile so that it can be commented out in Makefile.global
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 1996/07/25 20:01:51 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4.2.1 1996/08/19 19:32:58 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ ifeq ($(USE_READLINE), true)
 # CFLAGS += -DOLD_READLINE
 
    LIBCURSES=	-lcurses 
-   LD_ADD += -L$(READLINE_LIBDIR) -L$(HISTORY_LIBDIR) -lreadline -lhistory $(LIBCURSES)
+   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)
 

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 1996/07/25 20:01:51 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.4.2.1 1996/08/19 19:32:58 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -30,7 +30,7 @@ ifeq ($(USE_READLINE), true)`
`30`	`30`	`# CFLAGS += -DOLD_READLINE`
`31`	`31`
`32`	`32`	`LIBCURSES= -lcurses`
`33`		`- LD_ADD += -L$(READLINE_LIBDIR) -L$(HISTORY_LIBDIR) -lreadline -lhistory $(LIBCURSES)`
	`33`	`+ LD_ADD += -L$(READLINE_LIB) -L$(HISTORY_LIB) $(LIBCURSES)`
`34`	`34`	`# use the following if your readline has no separate history lib`
`35`	`35`	`# LD_ADD += -L$(READLINE_LIBDIR) -lreadline $(LIBCURSES)`
`36`	`36`