Skip to content

Commit 4c86b29

Browse files
df7cbmsdemlei
authored andcommitted
doc/Makefile: Default to USE_PGXS and openjade, and build docs during tests
1 parent 229b55a commit 4c86b29

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ stages:
55
stage: build
66
image: credativ/postgresql-build:${PGVERSION}
77
before_script:
8-
- apt-get -y install libhealpix-cxx-dev
8+
- apt-get -y install libhealpix-cxx-dev docbook-dsssl docbook-xml openjade
99
script:
1010
- make PROFILE="-Werror"
1111
- make install
1212
- if ! pg_virtualenv make installcheck; then cat regression.diffs; exit 1; fi
13+
- make -C doc
14+
- make -C doc install
1315

1416
build:9.4: { <<: *build, variables: { PGVERSION: '9.4' } }
1517
build:9.5: { <<: *build, variables: { PGVERSION: '9.5' } }

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dist: bionic
1616
before_install:
1717
# extra apt.pg.o.sh options added in version 204, travis currently has 199 (2019-11-27)
1818
- sudo apt-get -qq update
19-
- sudo apt-get -y install postgresql-common libhealpix-cxx-dev
19+
- sudo apt-get -y install postgresql-common libhealpix-cxx-dev docbook-dsssl docbook-xml openjade
2020

2121
install:
2222
- sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -p -v $PG_SUPPORTED_VERSIONS -i
@@ -26,3 +26,5 @@ script:
2626
- sudo make install
2727
- pg_virtualenv make installcheck
2828
- if test -s regression.diffs; then cat regression.diffs; fi
29+
- make -C doc
30+
- sudo make -C doc install

doc/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#
55
#----------------------------------------------------------------------------
66

7+
USE_PGXS = 1
78
ifdef USE_PGXS
89
PG_CONFIG = pg_config
910
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -23,7 +24,7 @@ COLLATEINDEX = $(DOCBOOKSTYLE)/bin/collateindex.pl
2324
endif
2425

2526
ifndef JADE
26-
JADE = jade
27+
JADE = openjade
2728
endif
2829
SGMLINCLUDE = -D $(srcdir)
2930

0 commit comments

Comments
 (0)