diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-23 17:40:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-23 17:40:36 +0000 |
| commit | 6009002c58669b93da8aca43001444a10d8cdda6 (patch) | |
| tree | c30574873e4b61090c744869eeda1c9daba618dd | |
| parent | 087671e87c9d4566f34544f4a7ccd32bd533d380 (diff) | |
* configure.in (LIBPATHFLAG): should escape $. [ruby-dev:18572]
* mkconfig.rb: never substute escaped $$.
* instruby.rb: not install LIBRUBY_SO unless enable-shared.
[ruby-dev:18569]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | instruby.rb | 7 | ||||
| -rw-r--r-- | mkconfig.rb | 2 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,12 @@ +Thu Oct 24 02:22:41 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * configure.in (LIBPATHFLAG): should escape $. [ruby-dev:18572] + + * mkconfig.rb: never substute escaped $$. + + * instruby.rb: not install LIBRUBY_SO unless enable-shared. + [ruby-dev:18569] + Wed Oct 23 19:16:06 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> * eval.c (rb_eval): added NODE_DSYM, symbol literal with diff --git a/configure.in b/configure.in index da394dcb0c..e4e8507878 100644 --- a/configure.in +++ b/configure.in @@ -779,7 +779,7 @@ if test "$with_dln_a_out" != yes; then netbsd*) LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" - LIBPATHFLAG=' -L%1$s -Wl,-R%1$s' + LIBPATHFLAG=' -L%1$$s -Wl,-R%1$$s' fi rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" diff --git a/instruby.rb b/instruby.rb index 557a81b03f..48a0e4cf33 100644 --- a/instruby.rb +++ b/instruby.rb @@ -20,6 +20,7 @@ destdir ||= '' $:.unshift CONFIG["srcdir"]+"/lib" require 'ftools' +require 'shellwords' class Installer < File; end class << Installer @@ -66,6 +67,8 @@ archlibdir = destdir+CONFIG["archdir"] sitelibdir = destdir+CONFIG["sitelibdir"] sitearchlibdir = destdir+CONFIG["sitearchdir"] mandir = destdir+CONFIG["mandir"] + "/man1" +configure_args = Shellwords.shellwords(CONFIG["configure_args"]) +enable_shared = configure_args.include?('--enable-shared') dll = CONFIG["LIBRUBY_SO"] lib = CONFIG["LIBRUBY"] arc = CONFIG["LIBRUBY_A"] @@ -76,7 +79,7 @@ Installer.install ruby_install_name+exeext, bindir+"/"+ruby_install_name+exeext, if rubyw_install_name and !rubyw_install_name.empty? Installer.install rubyw_install_name+exeext, bindir, 0755, true end -Installer.install dll, bindir, 0755, true unless dll == lib +Installer.install dll, bindir, 0755, true if enable_shared and dll != lib Installer.install lib, libdir, 0555, true unless lib == arc Installer.install arc, archlibdir, 0644, true Installer.install "config.h", archlibdir, 0644, true @@ -97,7 +100,7 @@ Dir.chdir CONFIG["srcdir"] Installer.install "sample/irb.rb", "#{bindir}/irb", 0755, true -Dir.glob("lib/*{.rb,help-message}") do |f| +Dir.glob("lib/**/*{.rb,help-message}") do |f| dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir Installer.makedirs dir, true unless File.directory? dir Installer.install f, dir, 0644, true diff --git a/mkconfig.rb b/mkconfig.rb index 0109f09737..aeecd1441d 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -39,7 +39,7 @@ File.foreach "config.status" do |line| next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name v = " CONFIG[\"" + name + "\"] = " + - val.gsub(/\$\{?(\w+)\}?/) {"$(#{$1})"}.dump + "\n" + val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1?"$(#{$1})":$&}.dump + "\n" if fast[name] v_fast << v else |