make/MacBundles.gmk

*** 55,81 ****
    JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_MACOSX_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST))
    JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_MACOSX_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST))
  
    # Copy empty directories (jre/lib/applet).
    $(JDK_MACOSX_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
!         $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(LOG_INFO)
          $(MKDIR) -p $(@D)
          if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
  
    $(JRE_MACOSX_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
!         $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(LOG_INFO)
          $(MKDIR) -p $(@D)
          if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
  
    $(JDK_MACOSX_BUNDLE_DIR)/MacOS/libjli.dylib:
!         $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(LOG_INFO)
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(LN) -s ../Home/lib/jli/libjli.dylib $@
  
    $(JRE_MACOSX_BUNDLE_DIR)/MacOS/libjli.dylib:
!         $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(LOG_INFO)
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(LN) -s ../Home/lib/jli/libjli.dylib $@
  
    $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \
--- 55,81 ----
    JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_MACOSX_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST))
    JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_MACOSX_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST))
  
    # Copy empty directories (jre/lib/applet).
    $(JDK_MACOSX_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
!         $(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
          $(MKDIR) -p $(@D)
          if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
  
    $(JRE_MACOSX_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
!         $(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
          $(MKDIR) -p $(@D)
          if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
  
    $(JDK_MACOSX_BUNDLE_DIR)/MacOS/libjli.dylib:
!         $(call LogInfo, Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@))
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(LN) -s ../Home/lib/jli/libjli.dylib $@
  
    $(JRE_MACOSX_BUNDLE_DIR)/MacOS/libjli.dylib:
!         $(call LogInfo, Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@))
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(LN) -s ../Home/lib/jli/libjli.dylib $@
  
    $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \