Skip to content

Commit 679de5e

Browse files
committed
Make pg_config location overridable for pgxs builds.
1 parent 7da24bc commit 679de5e

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

src/Makefile.global.in

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.222 2006/04/19 16:32:08 tgl Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.223 2006/07/20 09:30:18 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -118,16 +118,18 @@ localedir := @localedir@
118118

119119
else # PGXS case
120120

121-
bindir := $(shell pg_config --bindir)
122-
datadir := $(shell pg_config --sharedir)
123-
sysconfdir := $(shell pg_config --sysconfdir)
124-
libdir := $(shell pg_config --libdir)
125-
pkglibdir := $(shell pg_config --pkglibdir)
126-
includedir := $(shell pg_config --includedir)
127-
pkgincludedir := $(shell pg_config --pkgincludedir)
128-
mandir := $(shell pg_config --mandir)
129-
docdir := $(shell pg_config --docdir)
130-
localedir := $(shell pg_config --localedir)
121+
PG_CONFIG = pg_config
122+
123+
bindir := $(shell $(PG_CONFIG) --bindir)
124+
datadir := $(shell $(PG_CONFIG) --sharedir)
125+
sysconfdir := $(shell $(PG_CONFIG) --sysconfdir)
126+
libdir := $(shell $(PG_CONFIG) --libdir)
127+
pkglibdir := $(shell $(PG_CONFIG) --pkglibdir)
128+
includedir := $(shell $(PG_CONFIG) --includedir)
129+
pkgincludedir := $(shell $(PG_CONFIG) --pkgincludedir)
130+
mandir := $(shell $(PG_CONFIG) --mandir)
131+
docdir := $(shell $(PG_CONFIG) --docdir)
132+
localedir := $(shell $(PG_CONFIG) --localedir)
131133

132134
endif # PGXS
133135

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy