diff options
| -rw-r--r-- | lang/java/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lang/java/Makefile.am b/lang/java/Makefile.am index 649d635881f..75bd3aaf0bc 100644 --- a/lang/java/Makefile.am +++ b/lang/java/Makefile.am @@ -12,7 +12,7 @@ JDOCDIR = $(top_srcdir)/docs/java # The Java documentation is currently generated by Doxygen - disable javadoc #java_DATA = $(JDOCDIR)/index.html -javadir = $(datadir)/java +javadir = $(datadir)/java/$(PACKAGE)-$(PACKAGE_VERSION) JAVA_SRC = \ $(JAVADESTFULL)/Connection.java \ $(JAVADESTFULL)/Cursor.java \ @@ -35,6 +35,7 @@ JAVA_JUNIT = \ $(JAVATEST)/WiredTigerSuite.java dist_java_JAVA = $(JAVA_SRC) @JAVA_JUNIT@ +dist_java_DATA = wiredtiger.jar EXTRA_JAVA = $(JAVA_JUNIT) @@ -59,6 +60,7 @@ libwiredtiger_java_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) libwiredtiger_java_la_LIBADD = $(abs_top_builddir)/libwiredtiger.la all-local: wiredtiger.jar + $(JAVASRC)/wiredtiger_wrap.c: $(top_srcdir)/src/include/wiredtiger.in $(SWIG_SOURCES) (cd $(JAVASRC) && \ $(SWIG) -Wall -v -java -nodefaultctor -nodefaultdtor -package com.wiredtiger.db -I$(abs_top_builddir) -outdir $(JAVADEST) -o wiredtiger_wrap.c wiredtiger.i) @@ -69,5 +71,5 @@ $(JDOCDIR)/index.html: $(dist_java_JAVA) wiredtiger.jar: $(dist_java_JAVA) classjava.stamp (cd $(top_builddir) && \ - $(JAR) -cf wiredtiger.jar com/) - + $(JAR) -cf wiredtiger.jar com/) + cp $(top_builddir)/wiredtiger.jar . |