From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 9 Oct 2022 12:24:50 +0000 (+0200)
Subject: Subdirectory makefile working
X-Git-Tag: v2.3.1~19
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=bab0c591ab864b19eaed12c377ad43b1597a73e2;p=cc0%2Fargeo-build.git

Subdirectory makefile working
---

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 7e29e14..9200a42 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -127,7 +127,7 @@ public class Make {
 		// sources
 		for (String bundle : bundles) {
 			StringBuilder sb = new StringBuilder();
-			sb.append(sdkSrcBase.resolve(bundle).resolve("src"));
+			sb.append(execDirectory.resolve(bundle).resolve("src"));
 			sb.append("[-d");
 			compilerArgs.add(sb.toString());
 			sb = new StringBuilder();
@@ -211,7 +211,7 @@ public class Make {
 	 * JAR PACKAGING
 	 */
 	void createBundle(String bundle, String category) throws IOException {
-		Path source = sdkSrcBase.resolve(bundle);
+		Path source = execDirectory.resolve(bundle);
 		Path compiled = buildBase.resolve(bundle);
 		String bundleSymbolicName = source.getFileName().toString();