--- a/make/Init.gmk	Thu Mar 26 16:17:30 2015 +0100
+++ b/make/Init.gmk	Fri Mar 27 14:11:26 2015 +0100
@@ -52,7 +52,7 @@
 
 # Extract main targets from Main.gmk.
 ifneq ($(any_spec_file), )
-  ifeq ($(wildcard $(dir $(any_spec_file))/make-support),)
+  ifeq ($(wildcard $(dir $(any_spec_file))/make-support/module-deps.gmk),)
     # If make-support does not exist, we need to build the genmodules java tool first.
     $(info Creating data for first make execution in new configuration...)
     ignore_output := $(shell $(MAKE) -r -R -f $(topdir)/make/Main.gmk \