summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-09-12 14:41:49 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-09-12 16:13:22 +0200
commitc5a56f797afa88515119415d7d9b47b6abe34b1b (patch)
treef17ecba844ee67ef76227e724f12eeb28d7c333a
parent615fc2a7f88d364878165a935ede6c242e6e2fdf (diff)
downloadgnutls-add-doc-build.tar.gz
doc: fixed the epub documentation generationadd-doc-build
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/epub.texi10
3 files changed, 11 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9537673e4..6d3bf93c19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,12 @@ before_script:
Fedora/documentation:
script:
- - yum install -y gtk-doc texinfo texlive texlive-supertabular texlive-framed texlive-morefloats texlive-quotchap docbook5-style-xsl docbook-style-xsl
+ - yum install -y gtk-doc texinfo texlive texlive-supertabular texlive-framed texlive-morefloats texlive-quotchap docbook5-style-xsl docbook-style-xsl ruby zip
- make autoreconf && ./configure --disable-non-suiteb-curves --enable-gtk-doc
- make -j4
- - cd doc && make gnutls.html
- - cd doc && PATH="$PATH:/usr/share/sgml/docbook/xsl-stylesheets-1.78.1/epub/bin/" make gnutls.epub
- - cd doc/latex && make gnutls.pdf
+ - make -C doc gnutls.html
+ - PATH="$PATH:/usr/share/sgml/docbook/xsl-stylesheets-1.78.1/epub/bin/" make -C doc gnutls.epub
+ - make -C doc/latex gnutls.pdf
tags:
- shared
except:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 218bbc98ec..b9ba033ca7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -527,7 +527,7 @@ gnutls.xml: epub.texi
gnutls.epub: gnutls.xml
dbtoepub $<
- epub-fix --delete-unmanifested gnutls.epub
+ -epub-fix --delete-unmanifested gnutls.epub
ENUMS =
ENUMS += enums/dane_cert_type_t
diff --git a/doc/epub.texi b/doc/epub.texi
index 3afe9798ac..04fa9ca78f 100644
--- a/doc/epub.texi
+++ b/doc/epub.texi
@@ -138,22 +138,24 @@ Documentation License''.
@include cha-intro-tls.texi
-@include cha-cert-auth.texi
+@include cha-auth.texi
-@include cha-shared-key.texi
-
-@include cha-cert-auth2.texi
+@include cha-tokens.texi
@include cha-gtls-app.texi
@include cha-gtls-examples.texi
+@include cha-crypto.texi
+
@include cha-programs.texi
@include cha-internals.texi
@c appendices
+@include cha-upgrade.texi
+
@include cha-support.texi
@include cha-errors.texi