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

Commit58413fd

Browse files
committed
-----
|After sending my previous changes I found one more thing in Makefile.global.|Any tests should be done after including Makefile.custom or else there|won't be anything, particularly the port name, to base the tests on.|-----more changes to makefile.global from D'Arcy
1 parent41b8c2c commit58413fd

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

‎src/Makefile.global

Lines changed: 17 additions & 12 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.60 1996/11/1103:12:00 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.61 1996/11/11 12:19:05 scrappy Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -236,16 +236,6 @@ X11_LIB = -lX11 -lsocket -lnsl
236236

237237
YFLAGS = -d
238238

239-
##############################################################################
240-
#
241-
# AR
242-
243-
ifneq (,$(findstring /$(PORTNAME)/, /BSD44_derived/bsdi/sparc/))
244-
AROPT = cq
245-
else
246-
AROPT = crs
247-
endif
248-
249239
##############################################################################
250240
#
251241
# Installation.
@@ -303,6 +293,16 @@ endif
303293
# Since there are no longer separate files for each platform, much of the
304294
# commonality among the platforms ought to be factored out of the following.
305295

296+
##############################################################################
297+
#
298+
# AR
299+
300+
ifneq (,$(findstring /$(PORTNAME)/, /BSD44_derived/bsdi/sparc/))
301+
AROPT = cq
302+
else
303+
AROPT = crs
304+
endif
305+
306306
#----------------------------------------------------------------------
307307
ifeq ($PORTNAME, BSD44_derived)
308308
MK_PORT=BSD44_derived
@@ -855,7 +855,8 @@ srcdir=$(SRCDIR)
855855
includedir=$(HEADERDIR)
856856

857857

858-
# This goes here so that customization in Makefile.custom is effective
858+
# This goes here so that customizations in Makefile.custom and port
859+
# specific changes above are effective
859860
##############################################################################
860861
#
861862
# Flags for CC and LD. (depend on COPT and PROFILE)
@@ -894,3 +895,7 @@ CFLAGS+= $(CFLAGS_BE)
894895
LDADD+= $(LDADD_BE)
895896
LDFLAGS+= $(LDFLAGS_BE)
896897

898+
ifeq ($(USE_READLINE), false)
899+
CFLAGS += -DNOREADLINE
900+
endif
901+

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp