Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6abc8c2

Browse files
committed
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
1 parent 0251106 commit 6abc8c2

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

doc/src/sgml/extend.sgml

+10
Original file line numberDiff line numberDiff line change
@@ -1672,6 +1672,16 @@ include $(PGXS)
16721672
</listitem>
16731673
</varlistentry>
16741674

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+
16751685
<varlistentry>
16761686
<term><varname>NO_INSTALLCHECK</varname></term>
16771687
<listitem>

src/makefiles/pgxs.mk

+13
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
# TAP_TESTS -- switch to enable TAP tests
5050
# ISOLATION -- list of isolation test cases
5151
# 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
5254
# NO_INSTALLCHECK -- don't define an installcheck target, useful e.g. if
5355
# tests require special configuration, or don't use pg_regress
5456
# EXTRA_CLEAN -- extra files to remove in 'make clean'
@@ -227,6 +229,8 @@ all: all-lib
227229
endif # MODULE_big
228230

229231

232+
ifndef NO_INSTALL
233+
230234
install: all installdirs
231235
ifneq (,$(EXTENSION))
232236
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
@@ -336,6 +340,15 @@ endif # with_llvm
336340
uninstall: uninstall-lib
337341
endif # MODULE_big
338342

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+
339352

340353
clean:
341354
ifdef MODULES

src/test/modules/libpq_pipeline/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
PROGRAM = libpq_pipeline
44
OBJS = libpq_pipeline.o
55

6+
NO_INSTALL = 1
7+
68
PG_CPPFLAGS = -I$(libpq_srcdir)
79
PG_LIBS_INTERNAL += $(libpq_pgport)
810

0 commit comments

Comments
 (0)