fdo#70393: move more_fonts to a subdir of external

Change-Id: I82d3c4e7ad274e906d55fe883242bd9014ebe2e9
Reviewed-on: https://gerrit.libreoffice.org/6344
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

25 files changed, 3 insertions, 3 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5c337309c7a7..70eb666d30bc 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,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f4abc76b5f9d..8e7b93a99134 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \
+	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk
index d307041af5db..d307041af5db 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/external/more_fonts/ExternalPackage_dejavu.mk
diff --git a/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk
index 2099d66f82f0..2099d66f82f0 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/external/more_fonts/ExternalPackage_gentium.mk
diff --git a/more_fonts/ExternalPackage_liberation.mk b/external/more_fonts/ExternalPackage_liberation.mk
index b3a43c879aac..b3a43c879aac 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/external/more_fonts/ExternalPackage_liberation.mk
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/external/more_fonts/ExternalPackage_liberation_narrow.mk
index 93af73aae165..93af73aae165 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/external/more_fonts/ExternalPackage_liberation_narrow.mk
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/external/more_fonts/ExternalPackage_libertineg.mk
index 4e08aa2bc42d..4e08aa2bc42d 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/external/more_fonts/ExternalPackage_libertineg.mk
diff --git a/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk
index 53be59399312..53be59399312 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/external/more_fonts/ExternalPackage_opensans.mk
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk
index c9f0c988320d..c9f0c988320d 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/external/more_fonts/ExternalPackage_ptserif.mk
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk
index 416d44e1016d..416d44e1016d 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/external/more_fonts/ExternalPackage_sourcecode.mk
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk
index bf6d315bf865..bf6d315bf865 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/external/more_fonts/ExternalPackage_sourcesans.mk
diff --git a/more_fonts/Makefile b/external/more_fonts/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/more_fonts/Makefile
+++ b/external/more_fonts/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/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index c9a751485802..c9a751485802 100644
--- a/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
diff --git a/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk
index 021a51f4f379..43b9843d67a8 100644
--- a/more_fonts/Package_conf.mk
+++ b/external/more_fonts/Package_conf.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
+$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts))
 
 $(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTROOT)))
 
diff --git a/more_fonts/README b/external/more_fonts/README
index 4a676e9f6644..4a676e9f6644 100644
--- a/more_fonts/README
+++ b/external/more_fonts/README
diff --git a/more_fonts/UnpackedTarball_dejavu.mk b/external/more_fonts/UnpackedTarball_dejavu.mk
index d7742df8c456..d7742df8c456 100644
--- a/more_fonts/UnpackedTarball_dejavu.mk
+++ b/external/more_fonts/UnpackedTarball_dejavu.mk
diff --git a/more_fonts/UnpackedTarball_gentium.mk b/external/more_fonts/UnpackedTarball_gentium.mk
index 0827c0e23bfb..0827c0e23bfb 100644
--- a/more_fonts/UnpackedTarball_gentium.mk
+++ b/external/more_fonts/UnpackedTarball_gentium.mk
diff --git a/more_fonts/UnpackedTarball_liberation.mk b/external/more_fonts/UnpackedTarball_liberation.mk
index 8e428f55bc07..8e428f55bc07 100644
--- a/more_fonts/UnpackedTarball_liberation.mk
+++ b/external/more_fonts/UnpackedTarball_liberation.mk
diff --git a/more_fonts/UnpackedTarball_liberation_narrow.mk b/external/more_fonts/UnpackedTarball_liberation_narrow.mk
index 52e6f860b8f1..52e6f860b8f1 100644
--- a/more_fonts/UnpackedTarball_liberation_narrow.mk
+++ b/external/more_fonts/UnpackedTarball_liberation_narrow.mk
diff --git a/more_fonts/UnpackedTarball_libertineg.mk b/external/more_fonts/UnpackedTarball_libertineg.mk
index 51610baa545b..51610baa545b 100644
--- a/more_fonts/UnpackedTarball_libertineg.mk
+++ b/external/more_fonts/UnpackedTarball_libertineg.mk
diff --git a/more_fonts/UnpackedTarball_opensans.mk b/external/more_fonts/UnpackedTarball_opensans.mk
index 10bdc920e316..10bdc920e316 100644
--- a/more_fonts/UnpackedTarball_opensans.mk
+++ b/external/more_fonts/UnpackedTarball_opensans.mk
diff --git a/more_fonts/UnpackedTarball_ptserif.mk b/external/more_fonts/UnpackedTarball_ptserif.mk
index 4f739214b68b..4f739214b68b 100644
--- a/more_fonts/UnpackedTarball_ptserif.mk
+++ b/external/more_fonts/UnpackedTarball_ptserif.mk
diff --git a/more_fonts/UnpackedTarball_sourcecode.mk b/external/more_fonts/UnpackedTarball_sourcecode.mk
index 7040e9b185ba..7040e9b185ba 100644
--- a/more_fonts/UnpackedTarball_sourcecode.mk
+++ b/external/more_fonts/UnpackedTarball_sourcecode.mk
diff --git a/more_fonts/UnpackedTarball_sourcesans.mk b/external/more_fonts/UnpackedTarball_sourcesans.mk
index 65ff325535a1..65ff325535a1 100644
--- a/more_fonts/UnpackedTarball_sourcesans.mk
+++ b/external/more_fonts/UnpackedTarball_sourcesans.mk
diff --git a/more_fonts/fonts/fc_local.conf b/external/more_fonts/fonts/fc_local.conf
index 6af763c0b0f0..6af763c0b0f0 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/external/more_fonts/fonts/fc_local.conf