pgpool2.git / summary / log / commit / refs

commit    5cc53d87b6c529b3c109f2f2ce0929ba7bb71c92
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Thu Sep 12 12:45:41 2013 +0000

    Add Makefiles missed in source code reorganization.
    
    Also incorporate changes from Christoph Berg ([pgpool-general: 2127]).


 src/sql/Makefile                 | 45 ++++++++++++++++++++++++++++++++++++++++
 src/sql/pgpool-recovery/Makefile |  5 +++--
 src/sql/pgpool-regclass/Makefile | 25 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/sql/Makefile b/src/sql/Makefile
new file mode 100644
index 000000000..71597a48f
--- /dev/null
+++ b/src/sql/Makefile
@@ -0,0 +1,45 @@
+# $Header$
+#
+# pgpool: a language independent connection pool server for PostgreSQL
+# written by Tatsuo Ishii
+#
+# Copyright (c) 2003-2013	PgPool Global Development Group
+#
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose and without fee is hereby
+# granted, provided that the above copyright notice appear in all
+# copies and that both that copyright notice and this permission
+# notice appear in supporting documentation, and that the name of the
+# author not be used in advertising or publicity pertaining to
+# distribution of the software without specific, written prior
+# permission. The author makes no representations about the
+# suitability of this software for any purpose.  It is provided "as
+# is" without express or implied warranty.
+#
+# Makefile for sql/ directory.
+
+subdir = sql
+
+# if you are using PostgreSQL 8.0 or later,
+# using pg_config is recommended.
+# 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) 
+top_builddir = ..
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS = $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
+SUBDIRS = \
+		pgpool-recovery \
+		pgpool-regclass
+
+$(recurse)
diff --git a/src/sql/pgpool-recovery/Makefile b/src/sql/pgpool-recovery/Makefile
index 668b2d43e..df130772d 100644
--- a/src/sql/pgpool-recovery/Makefile
+++ b/src/sql/pgpool-recovery/Makefile
@@ -3,7 +3,7 @@ DATA_built = pgpool-recovery.sql
 DATA = uninstall_pgpool-recovery.sql
 
 EXTENSION = pgpool_recovery
-DATA = pgpool_recovery--1.1.sql
+DATA = pgpool_recovery--1.0.sql
 
 # if you are using PostgreSQL 8.0 or later,
 # using pg_config is recommended.
@@ -14,7 +14,8 @@ USE_PGXS = true
 top_builddir = ../..
 
 ifdef USE_PGXS
-PGXS = $(shell pg_config --pgxs)
+PG_CONFIG = pg_config
+PGXS = $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
 subdir = contrib/pgpool-recovery
diff --git a/src/sql/pgpool-regclass/Makefile b/src/sql/pgpool-regclass/Makefile
new file mode 100644
index 000000000..9b36787e9
--- /dev/null
+++ b/src/sql/pgpool-regclass/Makefile
@@ -0,0 +1,25 @@
+MODULES = pgpool-regclass
+DATA_built = pgpool-regclass.sql
+DATA = uninstall_pgpool-regclass.sql
+
+EXTENSION = pgpool_regclass
+DATA = pgpool_regclass--1.0.sql
+
+# if you are using PostgreSQL 8.0 or later,
+# using pg_config is recommended.
+# 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) 
+top_builddir = ../..
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS = $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/pgpool-regclass
+#top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif


[parent: 52d7ea721246]