makefiles/BuildJdk.gmk

Print this page

        

@@ -98,21 +98,21 @@
         +$(MAKE) -f Images.gmk overlay-images
 
 sign-jars:
         +$(MAKE) -f SignJars.gmk
 
-BINARIES:=$(notdir $(wildcard $(IMAGES_OUTPUTDIR)/j2sdk-image/bin/*))
+BINARIES:=$(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
 INSTALLDIR:=openjdk-$(RELEASE)
 
 # Install the jdk image, in a very crude way. Not taking into
 # account, how to install properly on macosx or windows etc.
 install:
         echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
         echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
         $(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
         $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
-        $(CP) -rp $(IMAGES_OUTPUTDIR)/j2sdk-image/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+        $(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
         $(MKDIR) -p $(INSTALL_PREFIX)/bin
         $(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
         $(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
 
 # The all target builds the JDK, but not the images