From 7b44707b9caa4528f1a6e8dd218644fa114007b3 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 29 Nov 2023 10:33:47 -0800 Subject: [PATCH v1 1/2] meson: Rename target names that conflict with global target names Author: Reviewed-by: Discussion: https://postgr.es/m/703110e4-b495-e409-26a5-28e9fca8f3a5@dunslane.net Backpatch: --- src/common/unicode/meson.build | 2 +- doc/src/sgml/meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/unicode/meson.build b/src/common/unicode/meson.build index 6af46122c4e..c548710c293 100644 --- a/src/common/unicode/meson.build +++ b/src/common/unicode/meson.build @@ -139,7 +139,7 @@ endif # Use a custom target, as run targets serialize the output, making this harder # to debug, and don't deal well with targets with multiple outputs. -update_unicode = custom_target('update-unicode', +update_unicode = custom_target('tgt-update-unicode', depends: update_unicode_dep, output: ['dont-exist'], input: update_unicode_targets, diff --git a/doc/src/sgml/meson.build b/doc/src/sgml/meson.build index e1a85dc607b..c604bdbd644 100644 --- a/doc/src/sgml/meson.build +++ b/doc/src/sgml/meson.build @@ -135,7 +135,7 @@ endif # Full documentation as html, text # if docs_dep.found() - html = custom_target('html', + html = custom_target('tgt-build-html', input: ['stylesheet.xsl', postgres_full_xml], output: 'html', depfile: 'html.d', @@ -144,7 +144,7 @@ if docs_dep.found() ) alldocs += html - install_doc_html = custom_target('install-html', + install_doc_html = custom_target('tgt-install-html', output: 'install-html', command: [ python, install_files, '--prefix', dir_prefix, @@ -224,7 +224,7 @@ endif # if docs_dep.found() # FIXME: implement / consider sqlmansectnum logic - man = custom_target('man', + man = custom_target('tgt-build-man', input: ['stylesheet-man.xsl', postgres_full_xml], output: ['man1', 'man3', 'man7'], depfile: 'man.d', -- 2.38.0