From 4bfda5d951a3d306e0501cffa77ecfa7a57c6c80 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Jan 2016 11:55:32 +0000
Subject: * common.mk: revert r53633. It broke rubyci and travis.  
 https://travis-ci.org/ruby/ruby/builds/104259623

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index 8e0a690a8f..1d8a362235 100644
--- a/common.mk
+++ b/common.mk
@@ -1005,7 +1005,7 @@ extract-gems: PHONY
 	    bundled_gems
 
 ### set the following environment variable or uncomment the line if
-### the Unicode data files should be updated completely on every update ('make up',...).
+### the Unicode data files are updated every minute.
 # ALWAYS_UPDATE_UNICODE = yes
 
 UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
@@ -1013,9 +1013,11 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
 		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \
 		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt
 
-update-unicode: $(UNICODE_FILES)
+UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time
 
-$(UNICODE_FILES):
+update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY
+
+$(UNICODE_FILES_DEPS):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@@ -1023,6 +1025,7 @@ $(UNICODE_FILES):
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
 	    $(UNICODE_FILES)
+	@exit > $@
 
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
 	$(srcdir)/.unicode-tables.time
-- 
cgit v1.2.3