From b83e54564ad0733f5382b20c04695ee9fb4cf451 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 9 Aug 2017 20:28:49 -0400 Subject: [PATCH] Fix order of ICU_CFLAGS It must be before CPPFLAGS so that an ICU installation in a nonstandard path can take precedence over one in the system path. --- src/Makefile.global.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 0d3f8ca950..a26075c06e 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -232,7 +232,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS) +override CPPFLAGS := $(ICU_CFLAGS) $(CPPFLAGS) ifdef PGXS override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS) -- 2.40.0