[Libreoffice-commits] core.git: solenv/gbuild

David Tardon dtardon at redhat.com
Tue Oct 25 20:54:41 UTC 2016


 solenv/gbuild/InstallModule.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 50cbc6fbe8fd107d69d2897755021265af463386
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 25 16:31:44 2016 +0200

    bail out on use of unknown install module
    
    Change-Id: Ic6ba34e1ea6aff49f308f41e5692e08edc5b77c2
    Reviewed-on: https://gerrit.libreoffice.org/30270
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index 45522dd..162af86 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -14,6 +14,7 @@ $(dir $(call gb_InstallModule_get_target,%))%/.dir :
 
 $(call gb_InstallModule_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),IMO,3)
+	$(if $(INSTALL_MODULE_DEFINED),,$(call gb_Output_error,Something depends on install module $* which does not exist.))
 	touch $@
 
 $(call gb_InstallModule_get_clean_target,%) :
@@ -23,6 +24,7 @@ $(call gb_InstallModule_get_clean_target,%) :
 define gb_InstallModule_InstallModule
 $(call gb_InstallModuleTarget_InstallModuleTarget,$(1))
 
+$(call gb_InstallModule_get_target,$(1)) : INSTALL_MODULE_DEFINED := $(true)
 $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1))
 $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
 $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))


More information about the Libreoffice-commits mailing list