fdo#70393: move beanshell to a subdir of external

Change-Id: I7e8324fd366a25db59becedfb3f00a10723f45be
Reviewed-on: https://gerrit.libreoffice.org/6283
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

RepositoryModule_host.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	basegfx \
 	basic \
 	bean \
-	$(call gb_Helper_optional,BSH,beanshell) \
 	binaryurp \
 	bridges \
 	$(call gb_Helper_optional,CAIRO,cairo) \

external/Module_external.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,AFMS,afms) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,BOOST,boost) \
+	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

external/beanshell/Module_beanshell.mk

@@ -9,14 +9,10 @@
 
 $(eval $(call gb_Module_Module,beanshell))
 
-ifneq ($(ENABLE_JAVA),)
-ifneq ($(filter BSH,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,beanshell,\
 	ExternalPackage_beanshell \
 	ExternalProject_beanshell \
 	UnpackedTarball_beanshell \
 ))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:

external/beanshell/UnpackedTarball_beanshell.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell))
 $(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell))
 
 $(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
-	beanshell/bsh-2.0b1-src.patch \
+	external/beanshell/bsh-2.0b1-src.patch \
 ))
 
 # vim: set noet sw=4 ts=4: