diff --git a/ChangeLog b/ChangeLog index c3845bf16b..8a9b4928cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 24 00:21:44 2014 NAKAMURA Usaku + + * Makefile.in, common.mk: move common-srcs to Makefile.in because + it breaks build on mswin. + Wed Dec 24 00:04:45 2014 NAKAMURA Usaku * lib/open-uri.rb (OpenURI.open_http): accept multiple certs path in diff --git a/Makefile.in b/Makefile.in index 8a7707a81f..177fb43a4e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -438,7 +438,7 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP) up:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) -after-update:: update-config_files +after-update:: update-config_files common-srcs update-mspec: @$(CHDIR) $(srcdir); \ diff --git a/common.mk b/common.mk index 6a878bcfc5..76ab061555 100644 --- a/common.mk +++ b/common.mk @@ -903,7 +903,7 @@ up:: up:: -$(Q)$(MAKE) $(MFLAGS) after-update -after-update:: update-unicode update-gems common-srcs extract-extlibs +after-update:: update-unicode update-gems extract-extlibs update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \