diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2020-12-29 03:36:35 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2020-12-29 04:15:40 +0100 |
| commit | a023565ed370851fd5bf61298460fe0adb0b4189 (patch) | |
| tree | c30bf9ac192e5e6a3d231fdae15652572c1b99b7 | |
| parent | ccdd1e3fd92591755e2b94bf63416c7b30cd217a (diff) | |
| download | pacman-a023565ed370851fd5bf61298460fe0adb0b4189.tar.gz pacman-a023565ed370851fd5bf61298460fe0adb0b4189.tar.xz | |
doc: make doxygen build from any directory
In the autotools build, it only built in-tree, from cwd = doc/ and
resolving doc/../lib/libalpm
In the meson build, this accidentally worked if cwd =
pacman/builddir/ and resolved to builddir/../lib/libalpm/
But... this should always have been configured with the actual path to
the inputs. So, we will now proceed to do so.
Fixes building man3 if your out of tree builddir doesn't happen to be a
direct subdirectory of the source root.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | doc/Doxyfile.in | 4 | ||||
| -rw-r--r-- | doc/meson.build | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 776318da..6744e765 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -117,8 +117,8 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../lib/libalpm/alpm.h \ - ../lib/libalpm/alpm_list.h +INPUT = @INPUT_DIRECTORY@/../lib/libalpm/alpm.h \ + @INPUT_DIRECTORY@/../lib/libalpm/alpm_list.h INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO diff --git a/doc/meson.build b/doc/meson.build index 570dc765..4aaac554 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -135,6 +135,7 @@ meson.add_install_script(MESON_MAKE_SYMLINK, doxygen = find_program('doxygen', required : get_option('doxygen')) if doxygen.found() and not get_option('doxygen').disabled() doxyconf = configuration_data() + doxyconf.set('INPUT_DIRECTORY', meson.current_source_dir()) doxyconf.set('OUTPUT_DIRECTORY', meson.current_build_dir()) doxyfile = configure_file( input : 'Doxyfile.in', |