$NetBSD$

--- hotspot/make/Makefile.orig	2014-01-25 07:34:04.000000000 +0000
+++ hotspot/make/Makefile
@@ -88,9 +88,9 @@ C2_VM_TARGETS=product  fastdebug  optimi
 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
 
-COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
-COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
-COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug
+COMMON_VM_PRODUCT_TARGETS=product product1 export_product
+COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 export_fastdebug
+COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 export_debug
 
 # JDK directory list
 JDK_DIRS=bin include jre lib demo
@@ -98,9 +98,9 @@ JDK_DIRS=bin include jre lib demo
 all:           all_product all_fastdebug
 
 ifdef BUILD_CLIENT_ONLY
-all_product:   product1 docs export_product
-all_fastdebug: fastdebug1 docs export_fastdebug
-all_debug:     jvmg1 docs export_debug
+all_product:   product1 export_product
+all_fastdebug: fastdebug1 export_fastdebug
+all_debug:     jvmg1 export_debug
 else
 ifeq ($(MACOSX_UNIVERSAL),true)
 all_product:   universal_product
@@ -113,19 +113,19 @@ all_debug:     $(COMMON_VM_DEBUG_TARGETS
 endif
 endif
 
-all_optimized: optimized optimized1 docs export_optimized
+all_optimized: optimized optimized1 export_optimized
 
 allzero:           all_productzero all_fastdebugzero
-all_productzero:   productzero docs export_product
-all_fastdebugzero: fastdebugzero docs export_fastdebug
-all_debugzero:     jvmgzero docs export_debug
-all_optimizedzero: optimizedzero docs export_optimized
+all_productzero:   productzero export_product
+all_fastdebugzero: fastdebugzero export_fastdebug
+all_debugzero:     jvmgzero export_debug
+all_optimizedzero: optimizedzero export_optimized
 
 allshark:           all_productshark all_fastdebugshark
-all_productshark:   productshark docs export_product
-all_fastdebugshark: fastdebugshark docs export_fastdebug
-all_debugshark:     jvmgshark docs export_debug
-all_optimizedshark: optimizedshark docs export_optimized
+all_productshark:   productshark export_product
+all_fastdebugshark: fastdebugshark export_fastdebug
+all_debugshark:     jvmgshark export_debug
+all_optimizedshark: optimizedshark export_optimized
 
 # Do everything
 world:         all create_jdk
@@ -403,7 +403,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/s
 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/%
 	$(install-file)
 
-HS_JNI_ARCH_SRC=$(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(HS_ARCH)/vm/jni_$(HS_ARCH).h)
+HS_JNI_ARCH_SRC=$(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(ARCH)/vm/jni_$(ARCH).h)
 $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_JNI_ARCH_SRC)
 	$(install-file)
 
@@ -420,8 +420,8 @@ $(EXPORT_INCLUDE_DIR)/jfr.h:
 endif
 
 # Doc files (jvmti.html)
-$(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
-	$(install-file)
+#$(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
+#	$(install-file)
 
 # Xusage file
 $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt: $(XUSAGE)
