Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit1bdbf40

Browse files
committed
Bring in changes to READLINE/HISTORY defines
1 parentc801ca0 commit1bdbf40

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

‎src/Makefile.global

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.21 1996/08/19 13:50:41 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.22 1996/08/20 05:04:06 scrappy Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -59,7 +59,7 @@
5959
#until after this file is processed!
6060
# make sure that you have no whitespaces after the PORTNAME setting
6161
# or the makefiles can get confused
62-
PORTNAME=svr4
62+
PORTNAME=BSD44_derived
6363

6464
# SRCDIR specifies where the source files are.
6565
SRCDIR=/home/tools/postgres95-1.02/src
@@ -157,10 +157,12 @@ EUROPEAN_DATES = 1
157157
USE_READLINE= true
158158

159159
# directories for the readline and history libraries.
160-
READLINE_INCDIR= /home/tools/include
161-
HISTORY_INCDIR= /home/tools/include -I/home/tools/include/readline
162-
READLINE_LIBDIR= /home/tools/lib
163-
HISTORY_LIBDIR= /home/tools/lib
160+
READLINE_INCDIR= -I/home/tools/include
161+
READLINE_LIBDIR= -L/home/tools/lib
162+
163+
# use the following if your readline has a separate history lib
164+
#HISTORY_INCDIR= -I/home/tools/include -I/home/tools/include/readline
165+
#HISTORY_LIBDIR= -L/home/tools/lib
164166

165167
# If you do not plan to use Host based authentication,
166168
# comment out the following line

‎src/bin/psql/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# 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.5 1996/08/20 05:04:13 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,17 +22,15 @@ include ../Makefile.global
2222
#
2323

2424
ifeq ($(USE_READLINE), true)
25-
CFLAGS +=-I$(READLINE_INCDIR) -I$(HISTORY_INCDIR)
25+
CFLAGS +=$(READLINE_INC)$(HISTORY_INC)
2626

2727
# if you are using an older readline that uses #include "readline.h" instead
2828
# of #include <readline/readline.h>,
2929
# uncomment this
3030
# CFLAGS += -DOLD_READLINE
3131

3232
LIBCURSES=-lcurses
33-
LD_ADD += -L$(READLINE_LIBDIR) -L$(HISTORY_LIBDIR) -lreadline -lhistory$(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)
3634

3735
ifeq ($(PORTNAME), ultrix4)
3836
LD_ADD += -ltermcap

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp