doc/Makefile: Default to USE_PGXS and openjade, and build docs during tests

df7cb · msdemlei · commit 4c86b295d431 · 2021-04-22T14:01:36.000+02:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,11 +5,13 @@ stages:
   stage: build
   image: credativ/postgresql-build:${PGVERSION}
   before_script:
-    - apt-get -y install libhealpix-cxx-dev
+    - apt-get -y install libhealpix-cxx-dev docbook-dsssl docbook-xml openjade
   script:
     - make PROFILE="-Werror"
     - make install
     - if ! pg_virtualenv make installcheck; then cat regression.diffs; exit 1; fi
+    - make -C doc
+    - make -C doc install
 
 build:9.4: { <<: *build, variables: { PGVERSION: '9.4' } }
 build:9.5: { <<: *build, variables: { PGVERSION: '9.5' } }
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ dist: bionic
 before_install:
   # extra apt.pg.o.sh options added in version 204, travis currently has 199 (2019-11-27)
   - sudo apt-get -qq update
-  - sudo apt-get -y install postgresql-common libhealpix-cxx-dev
+  - sudo apt-get -y install postgresql-common libhealpix-cxx-dev docbook-dsssl docbook-xml openjade
 
 install:
   - sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -p -v $PG_SUPPORTED_VERSIONS -i
@@ -26,3 +26,5 @@ script:
   - sudo make install
   - pg_virtualenv make installcheck
   - if test -s regression.diffs; then cat regression.diffs; fi
+  - make -C doc
+  - sudo make -C doc install
diff --git a/doc/Makefile b/doc/Makefile
@@ -4,6 +4,7 @@
 #
 #----------------------------------------------------------------------------
 
+USE_PGXS = 1
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -23,7 +24,7 @@ COLLATEINDEX = $(DOCBOOKSTYLE)/bin/collateindex.pl
 endif
 
 ifndef JADE
-JADE = jade
+JADE = openjade
 endif
 SGMLINCLUDE = -D $(srcdir)
 
