marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use 'libdir' build option. 

Closes: #148
Approved by: alexlarsson
auto
Valentin David 2018-05-03 17:22:47 +02:00 committed by Atomic Bot
parent c5b7a8e645
commit 9d0a01eda4
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/builder-module.c
View File

@ -1561,6 +1561,8 @@ builder_module_build_helper (BuilderModule *self,
g_auto(GStrv) configure_args = NULL;
g_autoptr(GPtrArray) configure_args_arr = g_ptr_array_new ();
g_autofree char *configure_content = NULL;
const char *prefix = NULL;
const char *libdir = NULL;
if (!g_file_load_contents (configure_file, NULL, &configure_content, NULL, NULL, error))
{
@ -1633,22 +1635,27 @@ builder_module_build_helper (BuilderModule *self,
else if (cmake_ninja)
cmake_generator = "Ninja";
prefix = builder_options_get_prefix (self->build_options, context);
libdir = builder_options_get_libdir (self->build_options, context);
if (cmake || cmake_ninja)
{
g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_PREFIX:PATH='%s'",
builder_options_get_prefix (self->build_options, context)));
g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_PREFIX:PATH='%s'", prefix));
if (libdir)
g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_LIBDIR:PATH='%s'", libdir));
g_ptr_array_add (configure_args_arr, g_strdup ("-G"));
g_ptr_array_add (configure_args_arr, g_strdup_printf ("%s", cmake_generator));
}
else if (qmake)
{
g_ptr_array_add (configure_args_arr, g_strdup_printf ("PREFIX='%s'",
builder_options_get_prefix (self->build_options, context)));
g_ptr_array_add (configure_args_arr, g_strdup_printf ("PREFIX='%s'", prefix));
/* TODO: What parameter for qmake? */
}
else /* autotools and meson */
{
g_ptr_array_add (configure_args_arr, g_strdup_printf ("--prefix=%s",
builder_options_get_prefix (self->build_options, context)));
g_ptr_array_add (configure_args_arr, g_strdup_printf ("--prefix=%s", prefix));
if (libdir)
g_ptr_array_add (configure_args_arr, g_strdup_printf ("--libdir=%s", libdir));
}
g_ptr_array_add (configure_args_arr, configure_final_arg);