From 4ae67d876a6bd3e1bd9126f46e96ef7395b18293 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Oct 2014 05:17:32 +0000
Subject: common.mk: after-configure

* common.mk (after-configure): update Unicode files after
  configure run.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk       | 4 +++-
 configure.in    | 4 +---
 win32/setup.mak | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index bb1d9b5632..09ce4a8cf2 100644
--- a/common.mk
+++ b/common.mk
@@ -1075,7 +1075,9 @@ dist:
 up::
 	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
 
-after-update:: update-unicode update-gems
+after-update:: after-configure update-gems
+
+after-configure:: update-unicode
 
 update-config_files: PHONY
 	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
diff --git a/configure.in b/configure.in
index 8cc7c8904e..d153523101 100644
--- a/configure.in
+++ b/configure.in
@@ -46,9 +46,6 @@ if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
 	BASERUBY="$BASERUBY --disable=gems"
     fi
     $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
-    $BASERUBY -C "$srcdir/enc/unicode/data" \
-	    ../../../tool/downloader.rb -e ${ALWAYS_UPDATE_UNICODE+-a} unicode \
-	    UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt
 else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
 fi
@@ -4234,4 +4231,5 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
 
 AC_OUTPUT
 }
+${MAKE-make} after-configure
 }
diff --git a/win32/setup.mak b/win32/setup.mak
index 840d3e6a68..c6bacbf337 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -218,4 +218,5 @@ $(CPU) = $(PROCESSOR_LEVEL)
 $(BANG)include $$(srcdir)/win32/Makefile.sub
 <<
 	@$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status
+	@$(MAKE) -l after-configure
 	@echo "type `nmake' to make ruby."
-- 
cgit v1.2.3