Message ID | 20241023205352.45271-1-sedat.dilek@gmail.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | meson: Collect all prefix get_option at one place | expand |
Context | Check | Description |
---|---|---|
mcgrof/vmtest-modules-next-PR | fail | merge-conflict |
mcgrof/vmtest-main-PR | fail | merge-conflict |
On Wed, Oct 23, 2024 at 10:52:49PM +0200, Sedat Dilek wrote: >Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> >--- applied, thanks Lucas De Marchi > meson.build | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/meson.build b/meson.build >index 58acf2eac8e9..2ed33c28471f 100644 >--- a/meson.build >+++ b/meson.build >@@ -187,6 +187,7 @@ sysconfdir = get_option('sysconfdir') > cdata.set_quoted('SYSCONFDIR', sysconfdir) > > bindir = join_paths(get_option('prefix'), get_option('bindir')) >+includedir = join_paths(get_option('prefix'), get_option('includedir')) > libdir = join_paths(get_option('prefix'), get_option('libdir')) > > distconfdir = get_option('distconfdir') >@@ -493,7 +494,7 @@ summary({ > 'sysconfdir' : sysconfdir, > 'distconfdir' : distconfdir, > 'libdir' : libdir, >- 'includedir' : join_paths(get_option('prefix'), get_option('includedir')), >+ 'includedir' : includedir, > 'bindir' : bindir > }, section : 'Directories') > >-- >2.45.2 >
diff --git a/meson.build b/meson.build index 58acf2eac8e9..2ed33c28471f 100644 --- a/meson.build +++ b/meson.build @@ -187,6 +187,7 @@ sysconfdir = get_option('sysconfdir') cdata.set_quoted('SYSCONFDIR', sysconfdir) bindir = join_paths(get_option('prefix'), get_option('bindir')) +includedir = join_paths(get_option('prefix'), get_option('includedir')) libdir = join_paths(get_option('prefix'), get_option('libdir')) distconfdir = get_option('distconfdir') @@ -493,7 +494,7 @@ summary({ 'sysconfdir' : sysconfdir, 'distconfdir' : distconfdir, 'libdir' : libdir, - 'includedir' : join_paths(get_option('prefix'), get_option('includedir')), + 'includedir' : includedir, 'bindir' : bindir }, section : 'Directories')
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)