All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, Gregor Jasny <gjasny@googlemail.com>
Subject: Re: [PATCH] meson: Fix install location of doxygen's man pages
Date: Mon, 20 Mar 2023 23:07:28 +0200	[thread overview]
Message-ID: <20230320210728.GL20234@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20230320213619.3cf1affb@coco.lan>

Hi Mauro,

On Mon, Mar 20, 2023 at 09:36:19PM +0100, Mauro Carvalho Chehab wrote:
> Em Mon, 20 Mar 2023 21:50:57 +0200 Laurent Pinchart escreveu:
> 
> > The doxygen man pages are incorrectly being installed alongside the HTML
> > documentation. Install them in the right location, in the $mandir
> > directory, by specifying a separate install location for each doxygen
> > target.
> > 
> > As a drive-by cleanup, replace the join_path() function with the meson's
> > '/' path concatenation operator.
> 
> Thanks for the quick fix!
> 
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >  doc/meson.build | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/doc/meson.build b/doc/meson.build
> > index fef3e83fa432..02a30dc5688a 100644
> > --- a/doc/meson.build
> > +++ b/doc/meson.build
> > @@ -15,15 +15,16 @@ doxyfile = configure_file(input : 'Doxyfile.in',
> >                            output : 'Doxyfile',
> >                            configuration : cdata)
> >  
> > -doxygen_install_dir = join_paths(get_option('datadir'), 'doc',
> > -                                 '@0@'.format(meson.project_name()))
> > +doxygen_install_dirs = []
> >  
> >  doxygen_output = []
> >  if get_option('doxygen-html')
> >      doxygen_output += 'html'
> > +    doxygen_install_dirs += get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
> >  endif
> >  if get_option('doxygen-man')
> >      doxygen_output += 'man'
> > +    doxygen_install_dirs += get_option('mandir') / '..'
> 
> This is hacky, but it also sounded to me the easiest/quickest way to
> address it. I wonder if are there a cleaner way to avoid it to place
> files under ${mandir}/man/man3. e. g. /usr/share/man/man/man3.

Not by using the custom_target() install_dir argument, as far as I can
see. meson provides a set of install_*() functions that may be
leveraged, and also allows running custom installation scripts with
meson.add_install_script() if needed. I decided to go for this small
hack for simplicity.

> This shouldn't be causing real problems, though, except if some
> distro would use non-Unix standard places, like setting mandir
> to something like "/weird/distro/manual_pages".

Yes, that would be problematic. Let's fix it when this theoretical
problem becomes a real one :-)

-- 
Regards,

Laurent Pinchart

      reply	other threads:[~2023-03-20 21:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-20 19:50 [PATCH] meson: Fix install location of doxygen's man pages Laurent Pinchart
2023-03-20 20:36 ` Mauro Carvalho Chehab
2023-03-20 21:07   ` Laurent Pinchart [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230320210728.GL20234@pendragon.ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=gjasny@googlemail.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.