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

Commit29a0fb8

Browse files
committed
|I have moved things around so that things happen in the following order:
|| 1. Set default variables| 2. Include Makefile.custom to override defaults| 3. Set CFLAGS, etc. with variables||This fixes the problem of Makefile.custom changes not taking effect.Submitted by: D'Arcy Cain
1 parent2db54b8 commit29a0fb8

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

‎src/Makefile.global

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.41 1996/10/21 06:56:57 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.42 1996/10/23 07:33:04 scrappy Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
1414
# override the default setting, create a Makefile.custom in this
1515
# directory and put your defines there. (Makefile.custom is included
16-
#at the end of this file.)
16+
#near the end of this file.)
1717
#
1818
# If you change any of these defines you probably have to
1919
#gmake clean; gmake
@@ -53,10 +53,8 @@
5353
#next-Motorola MC68K or Intel x86 on NeXTSTEP 3.2
5454
# but these are guaranteed not to work as of yet.
5555
#
56-
# XXXNote that you MUST set PORTNAME here (or on the command line) so
57-
#that port-dependent variables are correctly set within this file.
58-
#Makefile.custom does not take effect (for ifeq purposes)
59-
#until after this file is processed!
56+
# Note that portname is defined here to be UNDEFINED to remind you
57+
#to change it in Makefile.custom.
6058
# make sure that you have no whitespaces after the PORTNAME setting
6159
# or the makefiles can get confused
6260
PORTNAME=UNDEFINED
@@ -217,6 +215,17 @@ X11_INCDIR = /usr/include
217215
X11_LIBDIR = /usr/lib
218216
X11_LIB = -lX11 -lsocket -lnsl
219217

218+
##############################################################################
219+
#
220+
# Customization.
221+
#
222+
# This includes your local customizations if Makefile.custom exists
223+
# in the source directory. This file doesn't exist in the original
224+
# distribution so that it doesn't get overwritten when you upgrade.
225+
ifneq ($(wildcard $(MKDIR)/../Makefile.custom), )
226+
include $(MKDIR)/../Makefile.custom
227+
endif
228+
220229
# include port specific rules and variables. For instance:
221230
#
222231
# signal(2) handling - this is here because it affects some of
@@ -238,6 +247,17 @@ X11_LIB = -lX11 -lsocket -lnsl
238247
#
239248
-include $(MKDIR)/port/postgres.mk.$(PORTNAME)
240249

250+
##############################################################################
251+
#
252+
# Miscellaneous configuration
253+
#
254+
255+
srcdir=$(SRCDIR)
256+
includedir=$(HEADERDIR)
257+
objdir=obj
258+
259+
260+
# This goes here so that customization in Makefile.custom is effective
241261
##############################################################################
242262
#
243263
# Flags for CC and LD. (depend on CDEBUG and PROFILE)
@@ -277,24 +297,3 @@ CFLAGS+= $(CFLAGS_BE)
277297
LDADD+= $(LDADD_BE)
278298
LDFLAGS+= $(LDFLAGS_BE)
279299

280-
##############################################################################
281-
#
282-
# Miscellaneous configuration
283-
#
284-
285-
srcdir=$(SRCDIR)
286-
includedir=$(HEADERDIR)
287-
objdir=obj
288-
289-
290-
##############################################################################
291-
#
292-
# Customization.
293-
#
294-
# This includes your local customizations if Makefile.custom exists
295-
# in the source directory. This file doesn't exist in the original
296-
# distribution so that it doesn't get overwritten when you upgrade.
297-
ifneq ($(wildcard $(MKDIR)/../Makefile.custom), )
298-
include $(MKDIR)/../Makefile.custom
299-
endif
300-

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp