From 45d526e226dd99a6a25bffbfbbc2ea1a3a63b7e2 Mon Sep 17 00:00:00 2001
From: Chris Riccomini <criccomi@criccomi-mn.linkedin.biz>
Date: Thu, 2 Oct 2014 14:57:18 -0700
Subject: [PATCH] singular javadoc directory

---
 Makefile      | 2 +-
 java/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8abcfee18..5d3f954de 100644
--- a/Makefile
+++ b/Makefile
@@ -560,7 +560,7 @@ rocksdbjavastatic: libz.a libbz2.a libsnappy.a
 	rm -f ./java/$(ROCKSDBJNILIB)
 	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a
 	cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB)
-	mkdir -p java/javadocs;cd java/javadocs;jar -cf ../$(ROCKSDB_JAVADOCS_JAR) *
+	cd java/javadoc;jar -cf ../$(ROCKSDB_JAVADOCS_JAR) *
 	cd java;jar -cf $(ROCKSDB_SOURCES_JAR) org
 
 rocksdbjavastaticrelease: rocksdbjavastatic
diff --git a/java/Makefile b/java/Makefile
index 4ee73daf9..a500e599e 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -18,7 +18,7 @@ clean:
 	rm -rf javadocs/*
 
 javadocs:
-	mkdir -p javadocs; javadoc -d javadocs -sourcepath . -subpackages org
+	mkdir -p javadoc; javadoc -d javadoc -sourcepath . -subpackages org
 
 java: javadocs
 	javac org/rocksdb/util/*.java org/rocksdb/*.java