From ab421848c55220eb4cadb8610f9ace1cbc409b4a Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 16 Nov 2022 11:08:26 +0100
Subject: [PATCH] Use glob instead of specifying the lib_prefix.

There is no need to be specific here, we are already in INSTALL_DIR which
contains only things specific to our platform.
---
 .github/scripts/common.py | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/scripts/common.py b/.github/scripts/common.py
index b37dbb7..c31c8b6 100644
--- a/.github/scripts/common.py
+++ b/.github/scripts/common.py
@@ -54,13 +54,6 @@ PLATFORM_TO_RELEASE = {
     "wasm": "wasm-emscripten",
 }
 
-LIB_PREFIX = {
-    "android_arm": "arm-linux-androideabi",
-    "android_arm64": "aarch64-linux-android",
-    "android_x86": "i686-linux-android",
-    "android_x86_64": "x86_64-linux-android",
-}
-
 FLATPAK_HTTP_GIT_REMOTE = "https://github.com/flathub/org.kiwix.desktop.git"
 FLATPAK_GIT_REMOTE = "git@github.com:flathub/org.kiwix.desktop.git"
 
@@ -95,18 +88,12 @@ EXPORT_FILES = {
     "libzim": (
         INSTALL_DIR,
         (
-            "lib/{libprefix}/libzim.a".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
-            ),
-            "lib/{libprefix}/libzim.so".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
-            ),
-            "lib/{libprefix}/libzim.so.{version}".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+            "lib/*/libzim.a",
+            "lib/*/libzim.so",
+            "lib/*/libzim.so.{version}".format(
                 version=main_project_versions["libzim"]
             ),
-            "lib/{libprefix}/libzim.so.{version}".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+            "lib/*/libzim.so.{version}".format(
                 version=main_project_versions["libzim"][0]
             ),
             "lib/libzim.{}.dylib".format(
@@ -119,15 +106,11 @@ EXPORT_FILES = {
     "libkiwix": (
         INSTALL_DIR,
         (
-            "lib/{libprefix}/libkiwix.so".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
-            ),
-            "lib/{libprefix}/libkiwix.so.{version}".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+            "lib/*/libkiwix.so",
+            "lib/*/libkiwix.so.{version}".format(
                 version=main_project_versions["libkiwix"]
             ),
-            "lib/{libprefix}/libkiwix.so.{version}".format(
-                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+            "lib/*/libkiwix.so.{version}".format(
                 version=main_project_versions["libkiwix"][0]
             ),
             "include/kiwix/**/*.h"