OpenJDK / portola / portola
changeset 20546:5e40a295cce2
Merge
| author | tbell |
|---|---|
| date | Wed, 09 Oct 2013 23:19:08 -0700 |
| parents | 77ea1abb4480 636a866d26f0 |
| children | 453837141fac |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/makefiles/Images.gmk Wed Oct 09 18:50:46 2013 -0700 +++ b/jdk/makefiles/Images.gmk Wed Oct 09 23:19:08 2013 -0700 @@ -554,10 +554,12 @@ $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' + $(MKDIR) -p $(@D) $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ $(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' + $(MKDIR) -p $(@D) $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\