summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-12 16:06:35 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-12 16:06:35 +0000
commit101643bccdd0e496d1e81150b78c2ac2073951e7 (patch)
tree8bc2fda7eb8cb7941d6d39e7bcb5f551f21ac770
parent01c4c886625079245a45092c94ec8004df4f88cb (diff)
downloadruby-101643bccdd0e496d1e81150b78c2ac2073951e7.tar.gz
ruby-101643bccdd0e496d1e81150b78c2ac2073951e7.tar.xz
ruby-101643bccdd0e496d1e81150b78c2ac2073951e7.zip
Try to use DESTDIR when installing
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/rdoc.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 71b083bfe..7c1b3fb41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 13 01:04:37 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
+ incorporating DESTDIR in the rdoc installation.
+
Mon Jan 12 23:27:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): fix position after FCALL. [ruby-dev:22574]
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index ddcf217c4..215826c4f 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -159,6 +159,7 @@ module RDoc
when "file"
file_list << rel_file_name
when "directory"
+ next if rel_file_name == "CVS" || rel_file_name == ".svn"
next if options.exclude && options.exclude =~ rel_file_name
dot_doc = File.join(rel_file_name, DOT_DOC_FILENAME)
if File.file?(dot_doc)