[aarch64] Do not hardcode libdir in default module path. Contributes …

…to JB#49681 Plugins are under /usr/lib64 instead of /usr/lib on aarch64. Signed-off-by: Matti Lehtimäki <matti.lehtimaki@jolla.com>
sailfishos · Jul 3, 2020 · 23f06e7 · 23f06e7
1 parent 1ea5dbb
commit 23f06e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -202,6 +202,8 @@ CPPFLAGS += -DOSSOLOG_COMPILE
 CPPFLAGS += -DMCE_VAR_DIR=$(VARDIR)
 CPPFLAGS += -DMCE_RUN_DIR=$(RUNDIR)
 CPPFLAGS += -DPRG_VERSION=$(VERSION)
+# Default module path
+CPPFLAGS += -DMCE_DEFAULT_MCE_MODULE_PATH=$(MODULEDIR)
 
 ifeq ($(strip $(ENABLE_WAKELOCKS)),y)
 CPPFLAGS += -DENABLE_WAKELOCKS

diff --git a/inifiles/mce.ini b/inifiles/mce.ini
@@ -2,10 +2,10 @@
 
 [Modules]
 
-# Path to modules
+# Path to modules, usually architecture dependant
 #
 # Do not modify unless you're sure that you know what you're doing!
-ModulePath=/usr/lib/mce/modules
+#ModulePath=/usr/lib/mce/modules
 
 # Modules
 #

diff --git a/mce-modules.h b/mce-modules.h
@@ -35,7 +35,7 @@
 #define MCE_CONF_MODULES_MODULES        "Modules"
 
 /** Default value for module path */
-#define DEFAULT_MCE_MODULE_PATH         "/usr/lib/mce/modules"
+#define DEFAULT_MCE_MODULE_PATH         G_STRINGIFY(MCE_DEFAULT_MCE_MODULE_PATH)
 
 void mce_modules_dump_info(void);
 gboolean mce_modules_init(void);