fdo#70393: move libmspub to a subdir of external

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

RepositoryModule_host.mk

@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \

external/Module_external.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
+	$(call gb_Helper_optional,MSPUB,libmspub) \
 ))
 
 # vim: set noet sw=4 ts=4:

libmspub/Makefile → external/libmspub/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:

libmspub/Module_libmspub.mk → external/libmspub/Module_libmspub.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libmspub))
 
-ifeq ($(SYSTEM_MSPUB),NO)
-
 $(eval $(call gb_Module_add_targets,libmspub,\
 	ExternalProject_libmspub \
 	UnpackedTarball_libmspub \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4: