From: Philippe Gerum <rpm@xenomai.org>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Xenomai <xenomai@lists.linux.dev>
Subject: Re: [libevl][PATCH] utils/evl: Respect custom libexecdir
Date: Mon, 22 Jan 2024 14:53:41 +0100 [thread overview]
Message-ID: <87le8hfp92.fsf@xenomai.org> (raw)
In-Reply-To: <cafa3048-07bb-4a72-a7ce-3de961b971f7@siemens.com>
Jan Kiszka <jan.kiszka@siemens.com> writes:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This fixes execution of evl on Debian which uses multiarch-compatible
> paths for libexecdir.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> utils/evl.c | 2 +-
> utils/meson.build | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/utils/evl.c b/utils/evl.c
> index bb6aeb7..d14fce4 100644
> --- a/utils/evl.c
> +++ b/utils/evl.c
> @@ -118,7 +118,7 @@ int main(int argc, char *const argv[])
> error(1, ENOMEM, "%s", arg0);
>
> if (cmddir == NULL)
> - cmddir = find_install_dir(arg0, "libexec/evl");
> + cmddir = find_install_dir(arg0, LIBEXECDIR "/evl");
>
> ret = asprintf(&searchpath, "%s:%s", getenv("PATH"), cmddir);
> if (ret < 0)
> diff --git a/utils/meson.build b/utils/meson.build
> index a34ff19..59d818a 100644
> --- a/utils/meson.build
> +++ b/utils/meson.build
> @@ -2,6 +2,7 @@
>
> executable('evl',
> 'evl.c',
> + c_args: [ '-DLIBEXECDIR="' + get_option('libexecdir') + '"' ],
> install: true,
> dependencies: libevl_dep
> )
Merged, thanks.
--
Philippe.
prev parent reply other threads:[~2024-01-22 13:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 20:53 [libevl][PATCH] utils/evl: Respect custom libexecdir Jan Kiszka
2024-01-22 13:53 ` Philippe Gerum [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=87le8hfp92.fsf@xenomai.org \
--to=rpm@xenomai.org \
--cc=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).