14 files changed, 10 insertions, 14 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index bf900b1e62a5..4164b9c0cfdf 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	linguistic \
 	lotuswordpro \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
-	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9d24b23b51b9..92727a457299 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	$(call gb_Helper_optional,LIBXSLT,libxslt) \
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
+	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
diff --git a/libmariadb/Makefile b/external/libmariadb/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/libmariadb/Makefile
+++ b/external/libmariadb/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/Module_libmariadb.mk b/external/libmariadb/Module_libmariadb.mk
index 09c726ddb178..accee3fb581c 100644
--- a/libmariadb/Module_libmariadb.mk
+++ b/external/libmariadb/Module_libmariadb.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libmariadb))
 
-ifeq ($(SYSTEM_MARIADB),NO)
-
 $(eval $(call gb_Module_add_targets,libmariadb,\
 	StaticLibrary_mariadb \
 	UnpackedTarball_mariadb \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/StaticLibrary_mariadb.mk b/external/libmariadb/StaticLibrary_mariadb.mk
index 1174c9717d82..1174c9717d82 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/external/libmariadb/StaticLibrary_mariadb.mk
diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/external/libmariadb/UnpackedTarball_mariadb.mk
index ce0bd9f92b76..a198440ee917 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -11,13 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mariadb,$(MARIADB_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/configs/mysql_version.h))
+$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,external/libmariadb/configs/mysql_version.h))
 
 ifneq ($(OS),WNT)
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/configs/mac_my_config.h))
+$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/mac_my_config.h))
 else
-$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/configs/linux_my_config.h))
+$(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,external/libmariadb/configs/linux_my_config.h))
 endif
 endif # $(OS),WNT
 
@@ -27,11 +27,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 # <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of
 # non-static inline local_thr_alarm in libmariadb/net.c":
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
-    libmariadb/mariadb-thread.patch \
-    libmariadb/mariadb-swap.patch \
-    libmariadb/mariadb-trunk-40.patch \
-    libmariadb/mariadb-static-inline.patch \
-    libmariadb/mariadb-msvc.patch.1 \
+    external/libmariadb/mariadb-thread.patch \
+    external/libmariadb/mariadb-swap.patch \
+    external/libmariadb/mariadb-trunk-40.patch \
+    external/libmariadb/mariadb-static-inline.patch \
+    external/libmariadb/mariadb-msvc.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
diff --git a/libmariadb/configs/linux_my_config.h b/external/libmariadb/configs/linux_my_config.h
index 6007d85676fe..6007d85676fe 100644
--- a/libmariadb/configs/linux_my_config.h
+++ b/external/libmariadb/configs/linux_my_config.h
diff --git a/libmariadb/configs/mac_my_config.h b/external/libmariadb/configs/mac_my_config.h
index 38db37e3cef9..38db37e3cef9 100644
--- a/libmariadb/configs/mac_my_config.h
+++ b/external/libmariadb/configs/mac_my_config.h
diff --git a/libmariadb/configs/mysql_version.h b/external/libmariadb/configs/mysql_version.h
index 26120a9ec10a..26120a9ec10a 100644
--- a/libmariadb/configs/mysql_version.h
+++ b/external/libmariadb/configs/mysql_version.h
diff --git a/libmariadb/mariadb-msvc.patch.1 b/external/libmariadb/mariadb-msvc.patch.1
index 60fddae793ec..60fddae793ec 100644
--- a/libmariadb/mariadb-msvc.patch.1
+++ b/external/libmariadb/mariadb-msvc.patch.1
diff --git a/libmariadb/mariadb-static-inline.patch b/external/libmariadb/mariadb-static-inline.patch
index c82266b99809..c82266b99809 100644
--- a/libmariadb/mariadb-static-inline.patch
+++ b/external/libmariadb/mariadb-static-inline.patch
diff --git a/libmariadb/mariadb-swap.patch b/external/libmariadb/mariadb-swap.patch
index bfada2d2c4a6..bfada2d2c4a6 100644
--- a/libmariadb/mariadb-swap.patch
+++ b/external/libmariadb/mariadb-swap.patch
diff --git a/libmariadb/mariadb-thread.patch b/external/libmariadb/mariadb-thread.patch
index 997929f9eb28..997929f9eb28 100644
--- a/libmariadb/mariadb-thread.patch
+++ b/external/libmariadb/mariadb-thread.patch
diff --git a/libmariadb/mariadb-trunk-40.patch b/external/libmariadb/mariadb-trunk-40.patch
index 968a75048ebd..968a75048ebd 100644
--- a/libmariadb/mariadb-trunk-40.patch
+++ b/external/libmariadb/mariadb-trunk-40.patch