summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mk4
-rw-r--r--configure.in4
-rw-r--r--win32/setup.mak1
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."