summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2024-01-15 15:38:36 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2024-01-15 15:38:36 +0100
commitace41f4d7e7c2104c80723b01a876d22e0509233 (patch)
tree5fbc380e58339bde26e3322e5a6be285c01258c2
parent57d703c2e35edf14271a4baaceb8f1c0e2bd8207 (diff)
meson.build, data/cairomm.pc.in: Update htmlrefpub
-rw-r--r--data/cairomm.pc.in4
-rw-r--r--data/meson.build1
-rw-r--r--meson.build2
3 files changed, 4 insertions, 3 deletions
diff --git a/data/cairomm.pc.in b/data/cairomm.pc.in
index b6d19a2..1ee5b42 100644
--- a/data/cairomm.pc.in
+++ b/data/cairomm.pc.in
@@ -8,12 +8,12 @@ includedir=@includedir@
docdir=${datarootdir}/doc/@CAIROMM_MODULE_NAME@
doxytagfile=${docdir}/reference/@CAIROMM_MODULE_NAME@.tag
htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.cairographics.org/documentation/cairomm/reference
+htmlrefpub=https://cairo.pages.freedesktop.org/@PACKAGE_TARNAME@/
Name: cairomm
Description: C++ binding for the cairo graphics library
Version: @PACKAGE_VERSION@
-URL: http://www.cairographics.org/cairomm/
+URL: https://www.cairographics.org/cairomm/
Requires: @CAIROMM_MODULES@
Libs: -L${libdir} -lcairomm@MSVC_TOOLSET_VER@-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@
Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
diff --git a/data/meson.build b/data/meson.build
index 90813aa..5bf7d82 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -12,6 +12,7 @@ pkg_conf_data.set('libdir', '${exec_prefix}' / install_libdir)
pkg_conf_data.set('datarootdir', '${prefix}' / install_datadir)
pkg_conf_data.set('datadir', '${datarootdir}')
pkg_conf_data.set('includedir', '${prefix}' / install_includedir)
+pkg_conf_data.set('PACKAGE_TARNAME', meson.project_name())
pkg_conf_data.set('PACKAGE_VERSION', meson.project_version())
pkg_conf_data.set('CAIROMM_MODULE_NAME', cairomm_pcname)
pkg_conf_data.set('CAIROMM_API_VERSION', cairomm_api_version)
diff --git a/meson.build b/meson.build
index 94526c3..1d7a858 100644
--- a/meson.build
+++ b/meson.build
@@ -337,7 +337,7 @@ endif
if meson.is_subproject()
pkgconfig_vars = {
'htmlrefdir': install_prefix / install_docdir / 'reference' / 'html',
- 'htmlrefpub': 'http://www.cairographics.org/documentation/cairomm/reference'
+ 'htmlrefpub': 'https://cairo.pages.freedesktop.org/' + pkg_conf_data.get_unquoted('PACKAGE_TARNAME')
}
if build_documentation
pkgconfig_vars += {'doxytagfile': tag_file.full_path()}