pgpool2.git / summary / log / commit / refs

commit    7671794bad592814de545dabfd6a36fd699466da
Author:   pengbo <pengbo@sraoss.co.jp>
Date:     Thu Jun 09 04:25:57 2016 +0000

    change the Makefile under this directory src/sql/,that is proposed by
    [pgpool-hackers: 1611]
    
        -PG_CONFIG = pg_config
        +PG_CONFIG ?= pg_config


 src/sql/Makefile                 | 4 ++--
 src/sql/pgpool-recovery/Makefile | 4 ++--
 src/sql/pgpool-regclass/Makefile | 4 ++--
 src/sql/pgpool_adm/Makefile.in   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/sql/Makefile b/src/sql/Makefile
index 8b5e67bf4..767409a76 100644
--- a/src/sql/Makefile
+++ b/src/sql/Makefile
@@ -25,11 +25,11 @@ subdir = sql
 # if you are not, comment out following line and...
 USE_PGXS = true
 # set top_builddir to the PostgreSQL build source tree top.
-# (for example /usr/local/src/postgresql-9.0) 
+# (for example /usr/local/src/postgresql-9.0)
 top_builddir = ..
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+PG_CONFIG ?= pg_config
 PGXS = $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
diff --git a/src/sql/pgpool-recovery/Makefile b/src/sql/pgpool-recovery/Makefile
index 23e851de4..be767ba17 100644
--- a/src/sql/pgpool-recovery/Makefile
+++ b/src/sql/pgpool-recovery/Makefile
@@ -10,11 +10,11 @@ DATA = pgpool_recovery--1.1.sql
 # if you are not, comment out following line and...
 USE_PGXS = true
 # set top_builddir to the PostgreSQL build source tree top.
-# (for example /usr/local/src/postgresql-8.4) 
+# (for example /usr/local/src/postgresql-8.4)
 top_builddir = ../..
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+PG_CONFIG ?= pg_config
 PGXS = $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
diff --git a/src/sql/pgpool-regclass/Makefile b/src/sql/pgpool-regclass/Makefile
index 9b36787e9..7e31382b5 100644
--- a/src/sql/pgpool-regclass/Makefile
+++ b/src/sql/pgpool-regclass/Makefile
@@ -10,11 +10,11 @@ DATA = pgpool_regclass--1.0.sql
 # if you are not, comment out following line and...
 USE_PGXS = true
 # set top_builddir to the PostgreSQL build source tree top.
-# (for example /usr/local/src/postgresql-8.4) 
+# (for example /usr/local/src/postgresql-8.4)
 top_builddir = ../..
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+PG_CONFIG ?= pg_config
 PGXS = $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
diff --git a/src/sql/pgpool_adm/Makefile.in b/src/sql/pgpool_adm/Makefile.in
index 4e0b6905e..c7c14c3ef 100644
--- a/src/sql/pgpool_adm/Makefile.in
+++ b/src/sql/pgpool_adm/Makefile.in
@@ -12,11 +12,11 @@ SHLIB_LINK =  -L../../libs/pcp/.libs -lpcp -Wl,--as-needed -Wl,-rpath,'${prefix}
 # if you are not, comment out following line and...
 USE_PGXS = true
 # set top_builddir to the PostgreSQL build source tree top.
-# (for example /usr/local/src/postgresql-8.4) 
+# (for example /usr/local/src/postgresql-8.4)
 top_builddir = ../..
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else


[parent: 294cf4aa4d5a]