[libhandy] build: Fix gtk-doc install path



commit 163d15bff2a8b6445649da06e1069330a02754a7
Author: otreblan <otreblain gmail com>
Date:   Thu Oct 15 15:04:57 2020 -0500

    build: Fix gtk-doc install path
    
    Use libhandy-1 instead of libhandy.
    
    Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/365

 .gitlab-ci.yml  | 2 +-
 doc/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 822d7d14..ab349b16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ build-gtkdoc:
   dependencies:
     - build-debian-gcc
   script:
-    - ninja -C _build meson-libhandy-doc 2>&1 | tee _build/doc/buildlog
+    - ninja -C _build meson-libhandy-1-doc 2>&1 | tee _build/doc/buildlog
     - if grep -qs 'warning' _build/doc/buildlog; then exit 1; fi
     - mv _build/doc/html/ _reference/
   artifacts:
diff --git a/doc/meson.build b/doc/meson.build
index eeab57a4..23f0febd 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -47,6 +47,7 @@ glib_docpath = glib_prefix / 'share' / 'gtk-doc' / 'html'
 docpath      = get_option('datadir') / 'gtk-doc' / 'html'
 
 gnome.gtkdoc('libhandy',
+     module_version: apiversion,
            main_xml: 'handy-docs.xml',
             src_dir: [
                        meson.source_root() / 'src',
@@ -67,7 +68,6 @@ gnome.gtkdoc('libhandy',
                        '--extra-dir=@0@'.format(glib_docpath / 'gtk3'),
                        '--extra-dir=@0@'.format(glib_docpath / 'gdk-pixbuf'),
                      ],
-        install_dir: 'libhandy-' + apiversion,
       content_files: content_files,
         html_assets: images,
             install: true)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]