summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in5
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 514cfa631b..8c3315f429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 fa4288845d..fba1040008 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 $<