diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-07 09:09:29 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-07 09:09:58 +0900 |
| commit | c7477c3e1fb661ed1cbcda9c7fbc710f77390845 (patch) | |
| tree | f56f246c76a0645d3bf6c81b4841ab4b4ff629d4 | |
| parent | aef3bb3513d5b275ed9fa2765e83fab97122fd40 (diff) | |
Moved Makefile.in under template
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | defs/gmake.mk | 2 | ||||
| -rw-r--r-- | template/Makefile.in (renamed from Makefile.in) | 2 | ||||
| -rwxr-xr-x | tool/make-snapshot | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4143defed0..17eec60bf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -370,7 +370,7 @@ before_script: - ln -s ~/.downloaded-cache - "> config.status" - "> .rbconfig.time" - - sed -f tool/prereq.status Makefile.in common.mk > Makefile + - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile - make touch-unicode-files - make -s $JOBS $UPDATE_UNICODE up - make -s $JOBS srcs diff --git a/configure.ac b/configure.ac index 7f0a14b213..bed27c98f0 100644 --- a/configure.ac +++ b/configure.ac @@ -3915,7 +3915,7 @@ AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s AS_IF([test x"$firstmf" != x], [ AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"]) ]) -AC_CONFIG_FILES(Makefile, [ +AC_CONFIG_FILES(Makefile:template/Makefile.in, [ tmpmk=confmk$$.tmp { AS_IF([test ${VCS+set}], [ diff --git a/defs/gmake.mk b/defs/gmake.mk index 2fece7a6b1..738c8e33c0 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS +$(Q) \ { \ $(CHDIR) "$(srcdir)"; \ - sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \ + sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk template/Makefile.in; \ sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \ } | \ $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ diff --git a/Makefile.in b/template/Makefile.in index c9dd84556b..0fdc31ab3d 100644 --- a/Makefile.in +++ b/template/Makefile.in @@ -334,7 +334,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi $(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch) $(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch) -Makefile: $(srcdir)/enc/Makefile.in +Makefile: $(srcdir)/template/Makefile.in $(srcdir)/enc/Makefile.in $(MKFILES): config.status $(srcdir)/version.h @[ -f $@ ] && mv $@ $@.old diff --git a/tool/make-snapshot b/tool/make-snapshot index 3e90adba48..8b60ee21cb 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -389,7 +389,8 @@ def package(vcs, rev, destdir, tmp = nil) File.open("#{defaults}/ruby.rb", "w") {} miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross" baseruby = ENV["BASERUBY"] - mk = IO.read("Makefile.in").gsub(/^@.*\n/, '') + mk = (IO.read("template/Makefile.in") rescue IO.read("Makefile.in")). + gsub(/^@.*\n/, '') vars = { "EXTOUT"=>extout, "PATH_SEPARATOR"=>File::PATH_SEPARATOR, |