summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-04 02:54:02 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-04 02:54:02 +0000
commit6ec7e30ce06a7c6fd18c92e84caf2abe1d92b4ef (patch)
tree340cc84e007a1d8800620ffbf065b0e169f7a0be /common.mk
parentb7503d03ca530043837baff8fb4e9296a34ca4f8 (diff)
* 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
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk16
1 files changed, 9 insertions, 7 deletions
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