Commit6abc8c2

committed

Add NO_INSTALL option to pgxs

Apply in libpq_pipeline test makefile, so that the test file is notinstalled into tmp_install.Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/cb9d16a6-760f-cd44-28d6-b091d5fb6ca7%40enterprisedb.com

1 parent0251106 commit6abc8c2Copy full SHA for 6abc8c2

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1672,6 +1672,16 @@ include $(PGXS)`
`1672`	`1672`	`</listitem>`
`1673`	`1673`	`</varlistentry>`
`1674`	`1674`
	`1675`	`+ <varlistentry>`
	`1676`	`+ <term><varname>NO_INSTALL</varname></term>`
	`1677`	`+ <listitem>`
	`1678`	`+ <para>`
	`1679`	`+ don't define an <literal>install</literal> target, useful for test`
	`1680`	`+ modules that don't need their build products to be installed`
	`1681`	`+ </para>`
	`1682`	`+ </listitem>`
	`1683`	`+ </varlistentry>`
	`1684`	`+`
`1675`	`1685`	`<varlistentry>`
`1676`	`1686`	`<term><varname>NO_INSTALLCHECK</varname></term>`
`1677`	`1687`	`<listitem>`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@`
`49`	`49`	`# TAP_TESTS -- switch to enable TAP tests`
`50`	`50`	`# ISOLATION -- list of isolation test cases`
`51`	`51`	`# ISOLATION_OPTS -- additional switches to pass to pg_isolation_regress`
	`52`	`+# NO_INSTALL -- don't define an install target, useful for test modules`
	`53`	`+# that don't need their build products to be installed`
`52`	`54`	`# NO_INSTALLCHECK -- don't define an installcheck target, useful e.g. if`
`53`	`55`	`# tests require special configuration, or don't use pg_regress`
`54`	`56`	`# EXTRA_CLEAN -- extra files to remove in 'make clean'`
`@@ -227,6 +229,8 @@ all: all-lib`
`227`	`229`	`endif# MODULE_big`
`228`	`230`
`229`	`231`
	`232`	`+ifndefNO_INSTALL`
	`233`	`+`
`230`	`234`	`install: all installdirs`
`231`	`235`	`ifneq (,$(EXTENSION))`
`232`	`236`	`$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'`
`@@ -336,6 +340,15 @@ endif # with_llvm`
`336`	`340`	`uninstall: uninstall-lib`
`337`	`341`	`endif# MODULE_big`
`338`	`342`
	`343`	`+else# NO_INSTALL`
	`344`	`+`
	`345`	`+# Need this so that temp-install builds artifacts not meant for`
	`346`	`+# installation (Normally, check should depend on all, but we don't do`
	`347`	`+# that because of parallel make risk (dbf2ec1a1c0).)`
	`348`	`+install: all`
	`349`	`+`
	`350`	`+endif# NO_INSTALL`
	`351`	`+`
`339`	`352`
`340`	`353`	`clean:`
`341`	`354`	`ifdefMODULES`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`PROGRAM = libpq_pipeline`
`4`	`4`	`OBJS = libpq_pipeline.o`
`5`	`5`
	`6`	`+NO_INSTALL = 1`
	`7`	`+`
`6`	`8`	`PG_CPPFLAGS = -I$(libpq_srcdir)`
`7`	`9`	`PG_LIBS_INTERNAL +=$(libpq_pgport)`
`8`	`10`

Comments

(0)