Skip to content

Commit d59496c

Browse files
committed
Disable install/installcheck targets in doc/Makefile
Remove inclusion of 'pg_config --pgxs' makefile because it is not required to create the documentation. This makefile was designed to be included in top-level extension makefile. Inclusion in the doc/Makefile results into some unexpected behaviour when using 'install' or 'all' rules. Remove gmake -C doc install in .travis.yml because this target didn't do anything. I guess that the installation of the manual should be implemented in the top-level extension Makefile file, not in the doc/Makefile.
1 parent c5731c9 commit d59496c

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

Diff for: .travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ script:
4040
- pg_virtualenv make USE_HEALPIX=0 crushtest
4141
- if test -s regression.diffs; then cat regression.diffs; exit 1; fi
4242
- make -C doc
43-
- sudo make -C doc install

Diff for: doc/Makefile

+2-17
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,20 @@ $(error PGSPHERE_VERSION is not set)
1111
endif
1212
endif
1313

14-
USE_PGXS = 1
15-
16-
ifdef USE_PGXS
17-
PG_CONFIG = pg_config
18-
PGXS := $(shell $(PG_CONFIG) --pgxs)
19-
include $(PGXS)
20-
else
21-
subdir = contrib/pg_sphere/doc
22-
top_builddir = ../../..
23-
include $(top_builddir)/src/Makefile.global
24-
include $(top_srcdir)/contrib/contrib-global.mk
25-
endif
26-
27-
.SECONDARY:
28-
2914
ifndef FOP
3015
FOP = fop
3116
endif
3217

3318
ifdef XMLLINT
3419
XMLLINT := $(XMLLINT) --nonet
3520
else
36-
XMLLINT = $(missing) xmllint
21+
XMLLINT = xmllint --nonet
3722
endif
3823

3924
ifdef XSLTPROC
4025
XSLTPROC := $(XSLTPROC) --nonet
4126
else
42-
XSLTPROC = $(missing) xsltproc
27+
XSLTPROC = xsltproc --nonet
4328
endif
4429

4530
override XSLTPROCFLAGS += \

0 commit comments

Comments
 (0)