--- rxtx-20100211/Makefile.am	2008-09-14 21:36:27.000000000 +0000
+++ rxtx-20100211/Makefile.am	2022-06-13 14:29:53.614053681 +0000
@@ -111,11 +111,11 @@
 $(CLASSES): $(javafiles) $(TOP)/Makefile
 	$(JAVAH_FIX)
 	$(JAVAC) $(javafiles)
-	$(JAVAH) `(for i in $(javahfiles);do \
-		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
-			echo $(CLASSDIR).$$i; \
-		fi; \
-	done)`
+	$(JAVAH) `(for i in $(javahfiles);do \
+		if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+			echo $(SPATH)/gnu/io/$$i.java; \
+		fi; \
+	done)`
 	$(JAR) cf $(JARTARGET) $(CLASSTOP)/*
 
 #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
--- rxtx-20100211/configure.in	2022-06-13 14:26:39.201455298 +0000
+++ rxtx-20100211/configure.in	2022-06-13 14:26:39.207455285 +0000
@@ -484,7 +484,7 @@
 		;;
 	*)
 		find_java_native_include jni_md.h
-		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+		JAVAH="\$(JPATH)/bin/javac -h . -classpath \$(CLASSPATH) -d \$(DEST)"
 		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
 		JAR="\$(JPATH)/bin/jar"
 		JAVADOC="\$(JPATH)/bin/javadoc"
--- rxtx-20100211/configure.orig	2022-06-13 14:26:39.205455289 +0000
+++ rxtx-20100211/configure	2022-06-13 14:26:39.212455275 +0000
@@ -22116,7 +22116,7 @@
 		;;
 	*)
 		find_java_native_include jni_md.h
-		JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni"
+		JAVAH="\$(JPATH)/bin/javac -classpath $(CLASSPATH) -h $(DEST)"
 		JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3"
 		JAR="\$(JPATH)/bin/jar"
 		JAVADOC="\$(JPATH)/bin/javadoc"