From 83b2db9ea7e5a2510e88cb9846d0db35ec8c47f2 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Jun 2001 05:25:04 +0000
Subject: [PATCH] * lib/mkmf.rb: target_prefix is only for installation, not
 for   build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  5 +++++
 lib/mkmf.rb | 33 +++++++++++++++++----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62f3537252..d1f2adba31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 12 14:21:28 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb: target_prefix is only for installation, not for
+	  build.
+
 Mon Jun 11 14:29:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* confgure.in: add RUBY_CANONICAL_BUILD.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 3fcb272eba..075547c9cc 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -451,12 +451,13 @@ end
 }
 prefix = $(DESTDIR)#{CONFIG["prefix"].sub(drive, '')}
 exec_prefix = #{CONFIG["exec_prefix"].sub(drive, '')}
-libdir = #{$libdir.sub(drive, '')}#{target_prefix}
-rubylibdir = #{$rubylibdir.sub(drive, '')}#{target_prefix}
-archdir = #{$archdir.sub(drive, '')}#{target_prefix}
-sitedir = #{$sitedir.sub(drive, '')}#{target_prefix}
-sitelibdir = #{$sitelibdir.sub(drive, '')}#{target_prefix}
-sitearchdir = #{$sitearchdir.sub(drive, '')}#{target_prefix}
+libdir = #{$libdir.sub(drive, '')}
+rubylibdir = #{$rubylibdir.sub(drive, '')}
+archdir = #{$archdir.sub(drive, '')}
+sitedir = #{$sitedir.sub(drive, '')}
+sitelibdir = #{$sitelibdir.sub(drive, '')}
+sitearchdir = #{$sitearchdir.sub(drive, '')}
+target_prefix = #{target_prefix}
 
 #### End of system configuration section. ####
 
@@ -483,23 +484,23 @@ distclean:	clean
 
 realclean:	distclean
 
-install:	$(archdir)/$(DLLIB)
+install:	$(archdir)$(target_prefix)/$(DLLIB)
 
-site-install:	$(sitearchdir)/$(DLLIB)
+site-install:	$(sitearchdir)$(target_prefix)/$(DLLIB)
 
-$(archdir)/$(DLLIB): $(DLLIB)
-	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(rubylibdir) $(archdir)
-	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(archdir)/$(DLLIB)
+$(archdir)$(target_prefix)/$(DLLIB): $(DLLIB)
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(rubylibdir) $(archdir)$(target_prefix)
+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(archdir)$(target_prefix)/$(DLLIB)
 EOMF
-  install_rb(mfile, "$(rubylibdir)", srcdir)
+  install_rb(mfile, "$(rubylibdir)$(target_prefix)", srcdir)
   mfile.printf "\n"
 
   mfile.printf <<EOMF
-$(sitearchdir)/$(DLLIB): $(DLLIB)
-	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(sitearchdir)
-	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(sitearchdir)/$(DLLIB)
+$(sitearchdir)$(target_prefix)/$(DLLIB): $(DLLIB)
+	@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(sitearchdir)$(target_prefix)
+	@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(sitearchdir)$(target_prefix)/$(DLLIB)
 EOMF
-  install_rb(mfile, "$(sitelibdir)", srcdir)
+  install_rb(mfile, "$(sitelibdir)$(target_prefix)", srcdir)
   mfile.printf "\n"
 
   unless /mswin32/ =~ RUBY_PLATFORM