Install pg_regress where PGXS' "make installcheck" can find it.

alvherre · alvherre · commit ec9f81b4ae6e · 2005-11-28T12:03:56.000Z
diff --git 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
@@ -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'.
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/Makefile,v 1.36 2005/01/13 18:23:21 tgl Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/Makefile,v 1.37 2005/11/28 12:03:56 alvherre Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -24,6 +24,7 @@ all install installdirs uninstall dep depend distprep:`
`24`	`24`	`$(MAKE) -C pl $@`
`25`	`25`	`$(MAKE) -C makefiles $@`
`26`	`26`	`$(MAKE) -C utils $@`
	`27`	`+ $(MAKE) -C test/regress $@`
`27`	`28`
`28`	`29`	`install: install-local`
`29`	`30`