postgrespro
diff --git a/‎.gitignore
Lines changed: 2 additions & 2 deletions b/‎.gitignore
Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile
Lines changed: 1 addition & 1 deletion b/‎Makefile
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/Makefile
Lines changed: 0 additions & 27 deletions b/‎bin/Makefile
Lines changed: 0 additions & 27 deletions
diff --git a/‎regress/Makefile
Lines changed: 42 additions & 0 deletions b/‎regress/Makefile
Lines changed: 42 additions & 0 deletions
diff --git a/‎bin/expected/init-extension.out renamed to ‎regress/expected/init-extension.out b/‎bin/expected/init-extension.out renamed to ‎regress/expected/init-extension.out
diff --git a/‎bin/expected/init-legacy.out renamed to ‎regress/expected/init-legacy.out b/‎bin/expected/init-legacy.out renamed to ‎regress/expected/init-legacy.out
diff --git a/‎bin/expected/issue3.out renamed to ‎regress/expected/issue3.out b/‎bin/expected/issue3.out renamed to ‎regress/expected/issue3.out
diff --git a/‎bin/expected/plpgsql.out renamed to ‎regress/expected/plpgsql.out b/‎bin/expected/plpgsql.out renamed to ‎regress/expected/plpgsql.out
diff --git a/‎bin/expected/repack.out renamed to ‎regress/expected/repack.out b/‎bin/expected/repack.out renamed to ‎regress/expected/repack.out
diff --git a/‎bin/expected/tablespace.out renamed to ‎regress/expected/tablespace.out b/‎bin/expected/tablespace.out renamed to ‎regress/expected/tablespace.out
diff --git a/‎bin/sql/init-extension.sql renamed to ‎regress/sql/init-extension.sql b/‎bin/sql/init-extension.sql renamed to ‎regress/sql/init-extension.sql
diff --git a/‎bin/sql/init-legacy.sql renamed to ‎regress/sql/init-legacy.sql b/‎bin/sql/init-legacy.sql renamed to ‎regress/sql/init-legacy.sql
diff --git a/‎bin/sql/issue3.sql renamed to ‎regress/sql/issue3.sql b/‎bin/sql/issue3.sql renamed to ‎regress/sql/issue3.sql
diff --git a/‎bin/sql/plpgsql.sql renamed to ‎regress/sql/plpgsql.sql b/‎bin/sql/plpgsql.sql renamed to ‎regress/sql/plpgsql.sql
diff --git a/‎bin/sql/repack.sql renamed to ‎regress/sql/repack.sql b/‎bin/sql/repack.sql renamed to ‎regress/sql/repack.sql
diff --git a/‎bin/sql/tablespace.sql renamed to ‎regress/sql/tablespace.sql b/‎bin/sql/tablespace.sql renamed to ‎regress/sql/tablespace.sql
@@ -1,5 +1,5 @@
 # Global excludes across all subdirectories
 *.o
 *.so
-bin/regression.diffs
-bin/regression.out
+regress/regression.diffs
+regress/regression.out
@@ -23,7 +23,7 @@ $(error pg_repack requires PostgreSQL 8.3 or later. This is $(VERSION))
 endif
 
 
-SUBDIRS = bin lib
+SUBDIRS = bin lib regress
 
 all install installdirs uninstall distprep clean distclean maintainer-clean debug:
 	@for dir in $(SUBDIRS); do \
 
@@ -8,38 +8,11 @@
 
 PG_CONFIG ?= pg_config
 
-# version as a number, e.g. 9.1.4 -> 901
-VERSION := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
-INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed -E 's/([0-9]+)\.([0-9]+).*/\1*100+\2/'))))
-
 SRCS = pg_repack.c pgut/pgut.c pgut/pgut-fe.c
 OBJS = $(SRCS:.c=.o)
 PROGRAM = pg_repack
 
 
-#
-# Test suite
-#
-
-ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
-REGRESS := init-extension
-else
-REGRESS := init-legacy
-endif
-
-# plpgsql not available by default on pg < 9.0
-ifeq ($(shell echo $$(($(INTVERSION) < 900))),1)
-REGRESS += plpgsql
-endif
-
-REGRESS += repack tablespace
-
-# This test depends on collate, not supported before 9.1
-ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
-REGRESS += issue3
-endif
-
-
 # The version number of the program. It should be the same of the library.
 REPACK_VERSION = $(shell grep '"version":' ../META.json | head -1 \
 	| sed -e 's/[ 	]*"version":[ 	]*"\(.*\)",/\1/')
 
@@ -0,0 +1,42 @@
+#
+# pg_repack: regress/Makefile
+#
+#  Portions Copyright (c) 2008-2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+#  Portions Copyright (c) 2011, Itagaki Takahiro
+#  Portions Copyright (c) 2012, The Reorg Development Team
+#
+
+PG_CONFIG ?= pg_config
+
+# version as a number, e.g. 9.1.4 -> 901
+VERSION := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
+INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed -E 's/([0-9]+)\.([0-9]+).*/\1*100+\2/'))))
+
+
+#
+# Test suite
+#
+
+ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
+REGRESS := init-extension
+else
+REGRESS := init-legacy
+endif
+
+# plpgsql not available by default on pg < 9.0
+ifeq ($(shell echo $$(($(INTVERSION) < 900))),1)
+REGRESS += plpgsql
+endif
+
+REGRESS += repack tablespace
+
+# This test depends on collate, not supported before 9.1
+ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
+REGRESS += issue3
+endif
+
+
+USE_PGXS = 1	# use pgxs if not in contrib directory
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)