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

Commit9b94bce

Browse files
author
Bryan Henderson
committed
Put $(CURSES_LIB) in Makefile.global to replace similar thing in psql/Makefile.
1 parent7ab0ceb commit9b94bce

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

‎src/Makefile.global

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,21 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.79 1996/12/28 02:11:37 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.80 1996/12/30 23:19:23 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
14-
# variables it sets. To
15-
# override the default setting, create a Makefile.custom in this
14+
# variables it sets.
15+
#
16+
# To override the default setting, create a Makefile.custom in this
1617
# directory and put your defines there. (Makefile.custom is included
17-
# near the end of this file.)
18+
# near the end of this file). Sometimes, a variable gets set in
19+
# Makefile.global after Makefile.custom has been included, so you can't
20+
# simply set that variable in Makefile.custom. In those cases, there is
21+
# often another variable (like CUSTOM_COPT) that you can set in
22+
# Makefile.custom that influences the later setting of the true variable
23+
# of interest (like CFLAGS) by Makefile.global.
24+
#
1825
#
1926
# If you change any of these defines you probably have to
2027
# make clean; make
@@ -133,10 +140,6 @@ OIDNAMELEN= 36
133140
# Compile libpq++
134141
#HAVE_Cplusplus= true
135142

136-
# Uncomment out CUSTOM_COPT to generate a debug version
137-
# This overrides the compiler flags defined later in this file
138-
#CUSTOM_COPT=-g
139-
140143
# Commenting out CASSERT will make things go a LOT faster, but you will
141144
# also loose a lot of useful error-checking.
142145
CASSERT= true
@@ -166,6 +169,11 @@ READLINE_LIB= -L/home/tools/lib -lreadline
166169
#HISTORY_INC= -I/home/tools/include -I/home/tools/include/readline
167170
#HISTORY_LIB= -L/home/tools/lib -lhistory
168171

172+
# curses is required by readline. Ncurses has obsoleted curses, and may
173+
# in fact be what goes by the name "curses" on this system.
174+
175+
CURSES_LIB= -L/home/tools/lib -lcurses
176+
169177
# If you plan to use Kerberos for authentication...
170178
#
171179
# Comment out KRBVERS if you do not use Kerberos.

‎src/bin/psql/Makefile

Lines changed: 3 additions & 4 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.16 1996/12/04 03:06:16 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.17 1996/12/30 23:19:48 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -26,13 +26,12 @@ CFLAGS+= $(INCLUDE_OPT)
2626
ifeq ($(USE_READLINE), true)
2727
CFLAGS+=$(READLINE_INC)$(HISTORY_INC)
2828

29-
LIBCURSES=-lcurses
30-
LD_ADD+=$(READLINE_LIB)$(HISTORY_LIB)$(LIBCURSES)
29+
LD_ADD+=$(READLINE_LIB)$(HISTORY_LIB)$(CURSES_LIB)
3130

3231
ifeq ($(PORTNAME), ultrix4)
3332
LD_ADD+= -ltermcap
3433
else
35-
ifeq ($(PORTNAME),sunos4)
34+
ifeq ($(PORTNAME),sparc)
3635
LD_ADD+= -ltermcap
3736
else
3837
ifeq ($(PORTNAME), linux)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp