From 382fbf75827cbff7e6190dbb3a2cde65fab79456 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Feb 2016 02:54:02 +0000
Subject: * common.mk: Introduce two variables (UNICODE_DATA_DIR and  
 UNICODE_SRC_DATA_DIR) to eliminate repetitions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 common.mk | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ffe004bb4a..1b63810622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  4 11:53:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Introduce two variables (UNICODE_DATA_DIR and
+	  UNICODE_SRC_DATA_DIR) to eliminate repetitions.
+
 Wed Feb  3 12:13:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (str_new_frozen): if the given string is embeddedable
diff --git a/common.mk b/common.mk
index 94cb3ad198..eb01c54b84 100644
--- a/common.mk
+++ b/common.mk
@@ -1014,19 +1014,21 @@ update-bundled_gems: PHONY
 ### set the following environment variable or uncomment the line if
 ### the Unicode data files should be updated completely on every update ('make up',...).
 # ALWAYS_UPDATE_UNICODE = yes
+UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)
+UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
 
-UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
-		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \
-		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \
-		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt
+UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
+		$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
+		$(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \
+		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
 
 update-unicode: $(UNICODE_FILES)
 
 $(UNICODE_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
-	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-	    -d enc/unicode/data/$(UNICODE_VERSION) \
+	    -d $(UNICODE_DATA_DIR) \
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
 	    $(UNICODE_FILES)
@@ -1041,7 +1043,7 @@ $(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
 		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
 		-I $(srcdir) \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
-		enc/unicode/data/$(UNICODE_VERSION) lib/unicode_normalize
+		$(UNICODE_DATA_DIR) lib/unicode_normalize
 
 download-extlibs:
 	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext
-- 
cgit v1.2.3