--- a/ChangeLog	Tue Jul 14 16:51:23 2015 +0100
+++ b/ChangeLog	Tue Jul 14 20:34:03 2015 +0100
@@ -1,3 +1,71 @@
+2015-07-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR94: empty install target in Makefile.am
+	* Makefile.am:
+	(add-tzdata-support): Redefine using BUILD_SDK_DIR.
+	(clean-add-tzdata-support): Likewise.
+	(add-tzdata-support-debug): Likewise using BUILD_DEBUG_SDK_DIR.
+	(clean-add-tzdata-support-debug): Likewise.
+	(add-tzdata-support-boot): Likewise using BUILD_BOOT_SDK_DIR.
+	(clean-add-tzdata-support-boot): Likewise.
+	(install-exec-local): Remove copying of *.so files
+	from $(BUILD_SDK_DIR)/lib ; none in OpenJDK 7.
+	(install-data-local): Remove blacklisted.certs and
+	tzdb.dat which don't exist in OpenJDK 7. Add
+	jre/lib/zi and fontconfig files. Copy icons as
+	java-1.7.0.png.
+
+2015-05-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR94: empty install target in Makefile.am
+	* Makefile.am:
+	(BUILD_SDK_DIR): Added.
+	(BUILD_JRE_DIR): Likewise.
+	(BUILD_JRE_ARCH_DIR): Redefine using BUILD_SDK_DIR.
+	(BUILD_DEBUG_SDK_DIR): Added.
+	(BUILD_DEBUG_JRE_DIR): Likewise.
+	(BUILD_DEBUG_JRE_ARCH_DIR): Redefine using
+	BUILD_DEBUG_SDK_DIR.
+	(BUILD_BOOT_SDK_DIR): Added.
+	(BUILD_BOOT_JRE_DIR): Likewise.
+	(BUILD_BOOT_JRE_ARCH_DIR): Redefine using
+	BUILD_BOOT_SDK_DIR.
+	(DESKTOP_FILES): Likewise.
+	(EXTRA_DIST): Redefine using DESKTOP_FILES.
+	(install): Removed.
+	(bootstrap-directory-stage2): Redefine using
+	BUILD_BOOT_SDK_DIR.
+	(icedtea): Redefine using BUILD_SDK_DIR and
+	BUILD_JRE_DIR.
+	(add-systemtap): Likewise.
+	(clean-add-systemtap): Likewise.
+	(check-crypto): Redefine using BUILD_SDK_DIR.
+	(add-archive): Likewise.
+	(icedtea-debug): Likewise using BUILD_DEBUG_SDK_DIR
+	and BUILD_DEBUG_JRE_DIR.
+	(add-systemtap-debug): Likewise.
+	(clean-add-systemtap-debug): Likewise.
+	(check-crypto-debug): Redefine using BUILD_DEBUG_SDK_DIR.
+	(add-archive-debug): Likewise.
+	(icedtea-boot): Redefine using BUILD_BOOT_SDK_DIR.
+	(add-systemtap-boot): Likewise.
+	(clean-add-systemtap-boot): Likewise.
+	(check-crypto-boot): Redefine using BUILD_BOOT_SDK_DIR.
+	(add-archive-boot): Likewise.
+	(rebuild): Likewise.
+	(hotspot): Redefine using BUILD_SDK_DIR and
+	BUILD_BOOT_SDK_DIR.
+	(ADD_ZERO_CONFIGURE_ARGS): Redefine using $(BUILD_SDK_DIR).
+	(check-hotspot): Likewise.
+	(check-langtools): Likewise.
+	(check-jdk): Likewise.
+	(install-exec-local): Added. Installs JDK binaries,
+	headers, native libraries, tapsets, JAR and IDL files.
+	(install-data-local): Installs property files, man
+	pages, images, documentation and other miscellaneous
+	data files, such as the timezone database.
+	* NEWS: Updated.
+
 2015-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2507, G541462: Only apply PaX markings by default

--- a/Makefile.am	Tue Jul 14 16:51:23 2015 +0100
+++ b/Makefile.am	Tue Jul 14 20:34:03 2015 +0100
@@ -52,9 +52,15 @@
 RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
 CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
 SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
-BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-BUILD_BOOT_JRE_ARCH_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_SDK_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_JRE_DIR = $(BUILD_OUTPUT_DIR)/j2re-image
+BUILD_JRE_ARCH_DIR = $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_SDK_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_DEBUG_JRE_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_BOOT_SDK_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_BOOT_JRE_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_BOOT_JRE_ARCH_DIR = $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
 REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
 STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
 STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
@@ -764,13 +770,15 @@
 	$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
 	$(top_srcdir)/test/jtreg/excludelist.langtools.jtx 
 
+DESKTOP_FILES = jconsole.desktop policytool.desktop
+
 EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
 	$(top_srcdir)/patches/boot/*.patch \
 	$(top_srcdir)/patches/cacao/*.patch \
 	$(top_srcdir)/patches/jamvm/*.patch \
 	tools-copy contrib overlays \
-	jconsole.desktop policytool.desktop \
-	$(JTREG_SRCS) HACKING autogen.sh \
+	$(JTREG_SRCS) $(DESKTOP_FILES) \
+	HACKING autogen.sh \
 	tapset/hotspot.stp.in \
 	tapset/hotspot_jni.stp.in \
 	tapset/jstack.stp.in \
@@ -822,8 +830,6 @@
 	  rmdir stamps ; \
 	fi
 
-install:
-
 .PHONY: \
 	env env-boot snapshot clean-clone clean-patch \
 	clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
@@ -1816,7 +1822,7 @@
 # bootstrap/stage2.
 stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
 	rm -rf $(STAGE2_BOOT_DIR)
-	ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ $(STAGE2_BOOT_DIR)
+	ln -s $(BUILD_BOOT_SDK_DIR)/ $(STAGE2_BOOT_DIR)
 	if ! test -d $(STAGE2_BOOT_DIR)/include; then \
 	  ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include $(STAGE2_BOOT_DIR)/include; \
 	fi
@@ -1868,11 +1874,11 @@
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR)
+	mkdir -p $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+	mkdir -p $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
+	mkdir -p $(BUILD_SDK_DIR)/jre/lib/ext
+	mkdir -p $(BUILD_JRE_DIR)/lib/ext 
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1885,39 +1891,39 @@
 if ENABLE_JAMVM
 	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	@echo "IcedTea is served:" $(BUILD_SDK_DIR)
 	mkdir -p stamps
 	touch $@
 
 stamps/add-systemtap.stamp: stamps/icedtea.stamp
 if ENABLE_SYSTEMTAP
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	mkdir -p $(BUILD_SDK_DIR)/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    > $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    > $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    > $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+	  $(BUILD_SDK_DIR)/tapset/jstack.stp
 endif
 	touch stamps/add-systemtap.stamp
 
 clean-add-systemtap:
-	rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -rf $(BUILD_SDK_DIR)/tapset
 	rm -f stamps/add-systemtap.stamp
 
 stamps/add-nss.stamp: stamps/extract-jdk.stamp
@@ -1930,22 +1936,22 @@
 
 stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
 if WITH_TZDATA_DIR
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	if [ -e $(BUILD_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+	    $(BUILD_SDK_DIR)/jre/lib ; \
 	fi
 endif
 	touch stamps/add-tzdata-support.stamp
 
 clean-add-tzdata-support:
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-	  rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	if [ -e $(BUILD_SDK_DIR)/jre/lib/tz.properties ] ; then \
+	  rm -vf $(BUILD_SDK_DIR)/jre/lib/tz.properties ; \
 	fi
 	rm -f stamps/add-tzdata-support.stamp
 
 stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+	  $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -1957,9 +1963,9 @@
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
 if !ZERO_BUILD
-	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
 	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+	    $(BUILD_SDK_DIR)/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
 endif
@@ -1978,11 +1984,11 @@
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
-	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR)
+	mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+	mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
+	mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
+	mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/ext 
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1995,8 +2001,7 @@
 if ENABLE_JAMVM
 	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
-	@echo "IcedTea (debug build) is served:" \
-	  $(DEBUG_BUILD_OUTPUT_DIR)
+	@echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_SDK_DIR)
 	mkdir -p stamps
 	touch $@
 
@@ -2006,53 +2011,53 @@
 
 stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
 if ENABLE_SYSTEMTAP
-	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	mkdir -p $(BUILD_DEBUG_SDK_DIR)/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
-	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+	  $(BUILD_DEBUG_SDK_DIR)/tapset/jstack.stp
 endif
 	touch stamps/add-systemtap-debug.stamp
 
 clean-add-systemtap-debug:
-	rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -rf $(BUILD_DEBUG_SDK_DIR)/tapset
 	rm -f stamps/add-systemtap-debug.stamp
 
 stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
 if WITH_TZDATA_DIR
-	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+	    $(BUILD_DEBUG_SDK_DIR)/jre/lib; \
 	fi
 endif
 	touch stamps/add-tzdata-support-debug.stamp
 
 clean-add-tzdata-support-debug:
-	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-	  rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib/tz.properties ] ; then \
+	  rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/tz.properties ; \
 	fi
 	rm -f stamps/add-tzdata-support-debug.stamp
 
 stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
-	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+	if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
+	  $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -2064,9 +2069,9 @@
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
 if !ZERO_BUILD
-	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+	if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
 	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+	    $(BUILD_DEBUG_SDK_DIR)/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
 endif
@@ -2108,9 +2113,8 @@
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-	@echo "Bootstrapped IcedTea is served:" \
-	  $(BOOT_BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR)
+	@echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_SDK_DIR)
 	mkdir -p stamps
 	touch $@
 
@@ -2120,53 +2124,53 @@
 
 stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp
 if ENABLE_SYSTEMTAP
-	mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	mkdir -p $(BUILD_BOOT_SDK_DIR)/tapset ; \
 	grep "client IGNORE" $(BUILD_BOOT_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
-	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    $(BUILD_BOOT_SDK_DIR)/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_gc.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
-	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+	  $(BUILD_BOOT_SDK_DIR)/tapset/jstack.stp
 endif
 	touch stamps/add-systemtap-boot.stamp
 
 clean-add-systemtap-boot:
-	rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+	rm -rf $(BUILD_BOOT_SDK_DIR)/tapset
 	rm -f stamps/add-systemtap-boot.stamp
 
 stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
 if WITH_TZDATA_DIR
-	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
-	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+	    $(BUILD_BOOT_SDK_DIR)/jre/lib; \
 	fi
 endif
 	touch stamps/add-tzdata-support-boot.stamp
 
 clean-add-tzdata-support-boot:
-	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-	  rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib/tz.properties ] ; then \
+	  rm -vf $(BUILD_BOOT_SDK_DIR)/jre/lib/tz.properties ; \
 	fi
 	rm -f stamps/add-tzdata-support-boot.stamp
 
 stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
-	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+	if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
+	  $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -2178,9 +2182,9 @@
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
 if !ZERO_BUILD
-	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+	if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
 	  if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
-	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+	    $(BUILD_BOOT_SDK_DIR)/bin/java -Xshare:dump ; \
 	  fi ; \
 	fi
 endif
@@ -2209,12 +2213,12 @@
 	rm -f stamps/icedtea-boot.stamp
 	rm -f stamps/icedtea-stage1.stamp
 	$(ARCH_PREFIX) $(MAKE) icedtea-stage1
-	@echo "bootstrap-poured IcedTea is served (again):" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+	@echo "bootstrap-poured IcedTea is served (again):" $(BUILD_BOOT_SDK_DIR)
 else
 	rm -f stamps/icedtea.stamp
 	rm -f stamps/icedtea-stage2.stamp
 	$(ARCH_PREFIX) $(MAKE) icedtea-stage2
-	@echo "IcedTea is served (again):" $(BUILD_OUTPUT_DIR)/j2sdk-image
+	@echo "IcedTea is served (again):" $(BUILD_SDK_DIR)
 endif
 
 hotspot:
@@ -2223,19 +2227,19 @@
 	rm -f stamps/icedtea-stage1.stamp
 	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1
 	mkdir -p \
-	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	   $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
-	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-	@echo "HotSpot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+	   $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
+	@echo "HotSpot is served:" $(BUILD_BOOT_SDK_DIR)
 else
 	rm -f stamps/icedtea.stamp
 	rm -f stamps/icedtea-stage2.stamp
 	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
 	mkdir -p \
-	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	   $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
-	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-	@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
+	   $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
+	@echo "HotSpot is served:" $(BUILD_SDK_DIR)
 endif
 
 # Rhino support
@@ -2423,7 +2427,7 @@
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
-	--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
+	--with-jdk-home=$(BUILD_SDK_DIR) \
 	--disable-bootstrap --enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
@@ -2560,7 +2564,7 @@
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_SDK_DIR) \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
@@ -2570,7 +2574,7 @@
 	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_SDK_DIR) \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
 		`pwd`/openjdk/langtools/test \
@@ -2589,7 +2593,7 @@
 	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_SDK_DIR) \
 		$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		`pwd`/openjdk/jdk/test \
@@ -2716,6 +2720,172 @@
 	rm -rf $(CRYPTO_CHECK_BUILD_DIR)
 	rm -f stamps/cryptocheck.stamp
 
+# Installation Targets
+# ====================
+
+install-exec-local:
+	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib
+	${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
+	${mkinstalldirs} $(DESTDIR)${prefix}/tapset
+	for files in $(BUILD_SDK_DIR)/bin/*; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)$(bindir); \
+	done
+	for files in $(BUILD_SDK_DIR)/include/*.h; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)$(includedir); \
+	done
+	for files in $(BUILD_SDK_DIR)/include/$(BUILD_OS_DIR)/*.h; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR); \
+	done
+	for files in $(BUILD_SDK_DIR)/lib/*.jar; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
+	done
+	for files in $(BUILD_SDK_DIR)/lib/*.idl; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
+	done
+	$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${exec_prefix}/lib
+	for files in $(BUILD_SDK_DIR)/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli; \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/bin/*; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/bin; \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/lib/*.jar; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+	done
+	$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${prefix}/jre/lib
+	for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR); \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli; \
+	done
+	for vms in client server ; do \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
+	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	    for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/*.so; do \
+	      $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms}; \
+	    done ; \
+	  fi ; \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/ext; \
+	done
+	for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/tapset; \
+	done
+
+install-data-local:
+	${mkinstalldirs} $(DESTDIR)${prefix}
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security,zi}
+	${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
+	${mkinstalldirs} $(DESTDIR)${prefix}/demo
+	${mkinstalldirs} $(DESTDIR)${prefix}/sample
+	${mkinstalldirs} $(DESTDIR)$(docdir)
+	${mkinstalldirs} $(DESTDIR)$(datadir)/applications
+	${mkinstalldirs} $(DESTDIR)$(sysconfdir)/.java/.systemPrefs
+	for files in $(BUILD_SDK_DIR)/jre/lib/*.properties; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.{properties.src,bfc}; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+	done
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/release $(DESTDIR)${prefix}
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/src.zip $(DESTDIR)${prefix}
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/classlist $(DESTDIR)${prefix}/jre/lib
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/currency.data $(DESTDIR)${prefix}/jre/lib
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/jvm.hprof.txt $(DESTDIR)${prefix}/jre/lib
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/meta-index $(DESTDIR)${prefix}/jre/lib
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/psfont.properties.ja $(DESTDIR)${prefix}/jre/lib
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jvm.cfg \
+	  $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+	for vms in client server ; do \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
+	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/Xusage.txt \
+	      $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	  fi ; \
+	done
+	for files in $(BUILD_SDK_DIR)/jre/lib/cmm/*.pf; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/cmm; \
+	done
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/ext/meta-index $(DESTDIR)${prefix}/jre/lib/ext
+	for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/images/cursors; \
+	done
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/images/cursors/cursors.properties \
+	  $(DESTDIR)${prefix}/jre/lib/images/cursors
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/management/jmxremote.access \
+	  $(DESTDIR)${prefix}/jre/lib/management
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/management/management.properties \
+	  $(DESTDIR)${prefix}/jre/lib/management
+	for files in $(BUILD_SDK_DIR)/jre/lib/management/*.template; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/management; \
+	done
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/java.policy \
+	  $(DESTDIR)${prefix}/jre/lib/security
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/java.security \
+	  $(DESTDIR)${prefix}/jre/lib/security
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/nss.cfg \
+	  $(DESTDIR)${prefix}/jre/lib/security
+	for files in $(BUILD_SDK_DIR)/jre/lib/security/*.jar; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/security; \
+	done
+	for items in $(BUILD_SDK_DIR)/jre/lib/zi/*; do \
+	  cp -RP $${items} $(DESTDIR)${prefix}/jre/lib/zi ; \
+	done
+	for files in $(BUILD_SDK_DIR)/man/man1/*.1; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)$(mandir)/man1; \
+	done
+	for files in $(BUILD_SDK_DIR)/man/ja_JP.UTF-8/man1/*.1; do \
+	  $(INSTALL_DATA) $${files} $(DESTDIR)$(mandir)/ja_JP.UTF-8/man1; \
+	done
+	for items in $(BUILD_SDK_DIR)/demo/*; do \
+	  cp -RP $${items} $(DESTDIR)${prefix}/demo ; \
+	done
+	for items in $(BUILD_SDK_DIR)/sample/*; do \
+	  cp -RP $${items} $(DESTDIR)${prefix}/sample ; \
+	done
+	${INSTALL_DATA} $(srcdir)/README $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(srcdir)/NEWS $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(srcdir)/HACKING $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(BUILD_SDK_DIR)/ASSEMBLY_EXCEPTION $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(BUILD_SDK_DIR)/LICENSE $(DESTDIR)$(docdir)
+	${INSTALL_DATA} $(BUILD_SDK_DIR)/THIRD_PARTY_README $(DESTDIR)$(docdir)
+	for sizes in 16 24 32 48 ; do \
+	  ${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
+	  ${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
+	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-1.7.0.png ; \
+	done
+	for files in $(DESKTOP_FILES) ; do \
+	  ${INSTALL_DATA} $(srcdir)/$${files} $(DESTDIR)$(datadir)/applications ; \
+	done
+	touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.system.lock
+	touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile
+if ENABLE_DOCS
+	${mkinstalldirs} $(DESTDIR)$(docdir)/html
+	cp -RP $(BUILD_IMAGE_DIR)/docs $(DESTDIR)$(docdir)/html
+endif
+if !ENABLE_JAMVM
+if !ENABLE_CACAO
+if !ZERO_BUILD
+	for vms in client server ; do \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
+	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/classes.jsa \
+	      $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	  fi ; \
+	done
+endif
+endif
+endif
 # Target Aliases
 # ===============
 

--- a/NEWS	Tue Jul 14 16:51:23 2015 +0100
+++ b/NEWS	Tue Jul 14 20:34:03 2015 +0100
@@ -300,6 +300,7 @@
   - S8081315, PR2405: Avoid giflib interlacing workaround with giflib 5.0.0 on
   - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5
 * Bug fixes
+  - PR94: empty install target in Makefile.am
   - PR1661: Cleanup SYSTEM_GCONF option and allow it to be set false
   - PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
   - PR1816: Split download/extraction rules for OpenJDK so they can run in parallel