From 59cc0b45962e2ba0097ed898ece8f29ed144c5db Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Wed, 16 Sep 2020 18:33:51 +0200
Subject: [PATCH] fix javah (still works on debian jdk8u265-b01 at least)

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 477f6cc..deaa63a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -147,7 +147,7 @@ gen-jni-headers: codegen $(JNI_GENERATED_HH)
 # While "old" (Java 8) javah needs a list of java classes (e.g. foundation.pEp.jniadapter.Message)
 $(JNI_GENERATED_HH):
 ifeq ($(USE_JAVAH),1)
-	cd $(JAVA_BUILD_ROOT)/;$(JAVA_BIN_DIR)/$(JAVAH_CMD) -d ../../src/$(CXX_DIR) $(subst ${ },${space}\${\n}, $(subst /,.,$(subst $(JAVA_BUILD_ROOT),,$(basename $(sort $(wildcard $(JAVA_BUILD_ROOT)$(JAVA_PKG_BASENAME)*.class/))))))
+	cd $(JAVA_DIR)/;$(JAVA_BIN_DIR)/$(JAVAH_CMD) -d ../../src/$(CXX_DIR) $(subst ${ },${space}\${\n},$(subst /,.,$(patsubst %.java,%, $(subst java/,,$(sort $(wildcard java/foundation/pEp/jniadapter/*.java))))))
 else
 	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
 endif