diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-05-27 13:58:13 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-05-27 13:58:29 +0200 |
| commit | 6abc8c2596dbfcb24f9b4d954a1465b8015118c3 (patch) | |
| tree | 54a4460722231f6d80471c6fb04d5e1cdf4df97e | |
| parent | 025110663448a8c877f4b591495f2e5d187d8936 (diff) | |
| download | postgresql-6abc8c2596dbfcb24f9b4d954a1465b8015118c3.tar.gz postgresql-6abc8c2596dbfcb24f9b4d954a1465b8015118c3.zip | |
Add NO_INSTALL option to pgxs
Apply in libpq_pipeline test makefile, so that the test file is not
installed 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
| -rw-r--r-- | doc/src/sgml/extend.sgml | 10 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 13 | ||||
| -rw-r--r-- | src/test/modules/libpq_pipeline/Makefile | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index ec95b4eb013..dae57375748 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -1673,6 +1673,16 @@ include $(PGXS) </varlistentry> <varlistentry> + <term><varname>NO_INSTALL</varname></term> + <listitem> + <para> + don't define an <literal>install</literal> target, useful for test + modules that don't need their build products to be installed + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>NO_INSTALLCHECK</varname></term> <listitem> <para> diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 271e7eaba82..0f71fa293d0 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -49,6 +49,8 @@ # TAP_TESTS -- switch to enable TAP tests # ISOLATION -- list of isolation test cases # ISOLATION_OPTS -- additional switches to pass to pg_isolation_regress +# NO_INSTALL -- don't define an install target, useful for test modules +# that don't need their build products to be installed # NO_INSTALLCHECK -- don't define an installcheck target, useful e.g. if # tests require special configuration, or don't use pg_regress # EXTRA_CLEAN -- extra files to remove in 'make clean' @@ -227,6 +229,8 @@ all: all-lib endif # MODULE_big +ifndef NO_INSTALL + install: all installdirs ifneq (,$(EXTENSION)) $(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/' @@ -336,6 +340,15 @@ endif # with_llvm uninstall: uninstall-lib endif # MODULE_big +else # NO_INSTALL + +# Need this so that temp-install builds artifacts not meant for +# installation (Normally, check should depend on all, but we don't do +# that because of parallel make risk (dbf2ec1a1c0).) +install: all + +endif # NO_INSTALL + clean: ifdef MODULES diff --git a/src/test/modules/libpq_pipeline/Makefile b/src/test/modules/libpq_pipeline/Makefile index b798f5fbbc9..c9c5ae1beb5 100644 --- a/src/test/modules/libpq_pipeline/Makefile +++ b/src/test/modules/libpq_pipeline/Makefile @@ -3,6 +3,8 @@ PROGRAM = libpq_pipeline OBJS = libpq_pipeline.o +NO_INSTALL = 1 + PG_CPPFLAGS = -I$(libpq_srcdir) PG_LIBS_INTERNAL += $(libpq_pgport) |