From ec9f81b4ae6ee96c49187ab5b70f92f60f121d08 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 28 Nov 2005 12:03:56 +0000
Subject: [PATCH] Install pg_regress where PGXS' "make installcheck" can find
 it.

---
 src/Makefile                 | 3 ++-
 src/test/regress/GNUmakefile | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 0963f88a8f..03854405ae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.36 2005/01/13 18:23:21 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile,v 1.37 2005/11/28 12:03:56 alvherre Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,6 +24,7 @@ all install installdirs uninstall dep depend distprep:
 	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
 	$(MAKE) -C utils $@
+	$(MAKE) -C test/regress $@
 
 install: install-local
 
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index a3842542cd..3388389147 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -6,7 +6,7 @@
 # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.53 2005/11/01 15:09:11 adunstan Exp $
+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.54 2005/11/28 12:03:56 alvherre Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -55,6 +55,12 @@ pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global
 	  $< >$@
 	chmod a+x $@
 
+install: pg_regress
+	$(INSTALL_SCRIPT) pg_regress $(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress
+
+uninstall:
+	rm -f $(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress
+
 
 # Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE 'C'.