summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--enc/depend5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e11101937a..2196f405bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Dec 29 20:27:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 29 20:31:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enc/depend (clean): remove name2ctype.h when out-of-place build.
* win32/Makefile.sub (clean-enc): pass V to inferior make.
diff --git a/enc/depend b/enc/depend
index 7285649016..e9a5ad08e7 100644
--- a/enc/depend
+++ b/enc/depend
@@ -1,3 +1,4 @@
+% inplace = File.identical?($srcdir, ".")
% workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans"
% CONFIG["WORKDIRS"] = workdirs.join(' ')
% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
@@ -145,6 +146,10 @@ clean:
$(Q)$(RM) <%=pathrep[clean]%>
% end
% @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
+% unless inplace
+ $(Q)$(RM) enc/unicode/name2ctype.h
+ -$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
+% end
% workdirs.reverse_each do|dir|
-$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
% end