diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-25 03:22:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-25 03:22:30 +0000 |
| commit | d60ebedd7d1b08f89e93f9e36de6e1d45e38f748 (patch) | |
| tree | b5bbea1792dad23b45f928d931101d7068015f24 | |
| parent | e5862835f8a23147d6f5b9bb352df06a773cd3e4 (diff) | |
| download | ruby-d60ebedd7d1b08f89e93f9e36de6e1d45e38f748.tar.gz ruby-d60ebedd7d1b08f89e93f9e36de6e1d45e38f748.tar.xz ruby-d60ebedd7d1b08f89e93f9e36de6e1d45e38f748.zip | |
* Makefile.in (enc/unicode/name2ctype.h): explicitly ignores the
result of diff and turns -e option off, because *BSD make passes
it by default.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 5 |
2 files changed, 4 insertions, 6 deletions
@@ -1,7 +1,8 @@ -Tue Aug 25 11:42:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Aug 25 12:22:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in (enc/unicode/name2ctype.h): explicitly ignores the - result of diff. + result of diff and turns -e option off, because *BSD make passes + it by default. Tue Aug 25 02:16:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/Makefile.in b/Makefile.in index fa4288845..fba104000 100644 --- a/Makefile.in +++ b/Makefile.in @@ -212,7 +212,7 @@ NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2 enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd $(MAKEDIRS) $(@D) - @\ + @set +e; \ if cmp -s $(?:.kwd=.src) $?; then \ set -x; \ $(CP) $(?:.kwd=.h.blt) $@; \ @@ -227,9 +227,6 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd $(CP) $@ $(?:.kwd=.h.blt); \ fi -enc/unicode/name2ctype_prop.h: $(srcdir)/enc/unicode/name2ctype.kwd - $(MAKEDIRS) $(@D) - .c.@OBJEXT@: $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< |