diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-15 20:24:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-15 20:24:01 +0000 |
| commit | b861a93f9e5564ad29f256ec73f6d60e1b6d8e14 (patch) | |
| tree | 86b77241026e97e5d7e3bc74f444725f3dcbf69d | |
| parent | 7f20fd463820669774654dc0e49e0a83130a3cde (diff) | |
| download | ruby-b861a93f9e5564ad29f256ec73f6d60e1b6d8e14.tar.gz | |
Revert r55693 because it broke building on all platforms (and had no ChangeLog).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | enc/Makefile.in | 5 |
2 files changed, 4 insertions, 6 deletions
@@ -35,12 +35,11 @@ DOCLIE_GIT_REF = v1.1.5 STATIC_RUBY = static-ruby -TIMESTAMPDIR = $(EXTOUT)/.timestamp EXTCONF = extconf.rb LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time -PLATFORM_D = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time -ENC_TRANS_D = $(TIMESTAMPDIR)/.enc-trans.time +PLATFORM_D = ./$(PLATFORM_DIR)/.time +ENC_TRANS_D = ./enc/trans/.time RDOCOUT = $(EXTOUT)/rdoc HTMLOUT = $(EXTOUT)/html CAPIOUT = doc/capi diff --git a/enc/Makefile.in b/enc/Makefile.in index 8385236494..73b1e70941 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -20,9 +20,8 @@ TRANSSODIR = $(ENCSODIR)/trans DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ LIBEXT = @LIBEXT@ -TIMESTAMPDIR = $(EXTOUT)/.timestamp -ENC_TRANS_D = $(TIMESTAMPDIR)/.enc-trans.time -ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time +ENC_TRANS_D = ./enc/trans/.time +ENC_TRANS_SO_D = ./enc/trans/.so.time BUILTIN_ENCS = enc/ascii.c enc/us_ascii.c\ enc/unicode.c enc/utf_8.c |