From 8913378a07f36f5b2f601988c401c48770b9cfea Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 28 Apr 2025 06:22:03 +0200
Subject: fix path for target runsrc-% in make snippet java.mk

---
 _make/java.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '_make')

diff --git a/_make/java.mk b/_make/java.mk
index 411d996..5187724 100644
--- a/_make/java.mk
+++ b/_make/java.mk
@@ -103,7 +103,8 @@ $(addprefix runsrc-,$(_java_mainclassmodules)): runsrc-%:
 	$(patsubst %,$(_java_root)/%.java,\
 	 $(subst .,/,$(or \
 	  $(_java_main_class),\
-	  $*/$(firstword $(call _java_projvar,JAVA_MAINCLASSES))))) \
+	  $(strip $(if $(wildcard $(_java_root)/module-info.java),$*/)\
+	  )$(firstword $(call _java_projvar,JAVA_MAINCLASSES))))) \
 	$(call _java_projvar,JAVA_RUNTIME_ARGS))
 
 $(addprefix runclass-,$(_java_mainclassmodules)): runclass-%: build-%
-- 
cgit v1.2.3