summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-17 18:50:50 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-17 18:50:50 +0000
commit8ae4d64c1a1987c3bc5bdefbbad047df0a7fa24c (patch)
tree3a5de9007046b78d91e233628f442a9b46b5672f
parent8aaf906eddeb18c1b1ff203449dddc81bda56c97 (diff)
downloadruby-8ae4d64c1a1987c3bc5bdefbbad047df0a7fa24c.tar.gz
ruby-8ae4d64c1a1987c3bc5bdefbbad047df0a7fa24c.tar.xz
ruby-8ae4d64c1a1987c3bc5bdefbbad047df0a7fa24c.zip
* lib/mkmf.rb: unbreak "make install". lib/* must be installed
under $rubylibdir, not under $libdir. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 33931bdfa..490008652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 18 03:45:55 2001 Brian F. Feldman <green@FreeBSD.org>
+
+ * lib/mkmf.rb: unbreak "make install". lib/* must be installed
+ under $rubylibdir, not under $libdir.
+
Fri May 18 01:11:02 2001 Usaku Nakamura <usa@osb.att.ne.jp>
* ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2208d6733..cd1620ee9 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -488,10 +488,10 @@ install: $(archdir)/$(DLLIB)
site-install: $(sitearchdir)/$(DLLIB)
$(archdir)/$(DLLIB): $(DLLIB)
- @$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(archdir)
+ @$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(rubylibdir) $(archdir)
@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(archdir)/$(DLLIB)
EOMF
- install_rb(mfile, "$(libdir)", srcdir)
+ install_rb(mfile, "$(rubylibdir)", srcdir)
mfile.printf "\n"
mfile.printf <<EOMF