Split autotools and meson

autotools is not really autotools but covers arbitrary legacy build systems using make. It's not safe to touch arguments there.
flatpak · Jul 1, 2024 · 8c28237 · 8c28237
1 parent 61e3a2e
commit 8c28237
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/builder-module.c b/src/builder-module.c
@@ -1797,14 +1797,20 @@ builder_module_build_helper (BuilderModule  *self,
           g_ptr_array_add (configure_args_arr, g_strdup_printf ("PREFIX='%s'", prefix));
           /* TODO: What parameter for qmake? */
         }
-      else /* autotools and meson */
+      else if (meson)
         {
           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));
           else
             g_ptr_array_add (configure_args_arr, g_strdup_printf ("--libdir=%s/lib", prefix));
         }
+      else /* autotool */
+        {
+          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);
       g_ptr_array_add (configure_args_arr, NULL);