From: "Nobuyoshi.Nakada" <nobu.nakada@...>
Date: 2000-08-04T13:15:41+09:00
Subject: [ruby-dev:10555] Re: environment variables

なかだです。

At Fri, 4 Aug 2000 10:02:02 +0900
"Nobuyoshi.Nakada" <nobu.nakada@nifty.ne.jp> wrote:
>   LIBRUBY_SO を変えられてるとまずいような気がするのでこんなんではどうで
> しょう。

  すいません、configure.in のパッチが逆でした。それと Makefile.in も抜け
てました。


diff -pruPX ./.excludes current/Makefile.in devel/Makefile.in
--- current/Makefile.in	Thu Aug  3 18:50:32 2000
+++ devel/Makefile.in	Fri Aug  4 12:52:44 2000
@@ -24,6 +24,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@
 SOLIBS = @SOLIBS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 
diff -pruPX ./.excludes current/configure.in devel/configure.in
--- current/configure.in	Thu Aug  3 18:50:32 2000
+++ devel/configure.in	Fri Aug  4 09:57:58 2000
@@ -724,10 +724,11 @@ case "$target_os" in
     ;;
 esac
 
+RUBY_SO_NAME='lib$(RUBY_INSTALL_NAME)'
 LIBRUBY_LDSHARED=$LDSHARED
 LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
-LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so'
+LIBRUBY_SO='$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
+LIBRUBY_ALIASES='$(RUBY_SO_NAME).so'
 ENABLE_SHARED=no
 
 AC_ARG_ENABLE(enable-shared,
@@ -740,23 +741,23 @@ if test "$enable_shared" = 'yes'; then
   ENABLE_SHARED=yes
   case "$target_os" in
     sunos4*)
-	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
+	LIBRUBY_ALIASES='$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) $(RUBY_SO_NAME).so'
 	;;
     linux*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
+	LIBRUBY_DLDFLAGS='-Wl,-soname,$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+	LIBRUBY_ALIASES='$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) $(RUBY_SO_NAME).so'
 	;;
     freebsd*)
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
+	LIBRUBY_SO='$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
 	if test "$rb_cv_binary_elf" != "yes" ; then
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
 	fi
 	;;
     netbsd*)
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
+	LIBRUBY_SO='$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
-	   LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
+	   LIBRUBY_ALIASES='$(RUBY_SO_NAME).so.$(MAJOR) $(RUBY_SO_NAME).so'
 	else
 	   LIBRUBY_ALIASES=  # a.out platforms
 	fi
@@ -766,8 +767,8 @@ if test "$enable_shared" = 'yes'; then
  	;;
     hpux*)
 	XLDFLAGS='-Wl,+s,+b,$(prefix)/lib'
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).sl'
+	LIBRUBY_SO='$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_ALIASES='$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) $(RUBY_SO_NAME).sl'
 	;;
     aix*)
 	if test "$GCC" = yes; then
@@ -777,7 +778,7 @@ if test "$enable_shared" = 'yes'; then
 	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
 	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
 	fi
-	LIBRUBYARG='-L${prefix}/lib -Wl,lib$(RUBY_INSTALL_NAME).so'
+	LIBRUBYARG='-L${prefix}/lib -Wl,$(RUBY_SO_NAME).so'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
@@ -832,7 +833,8 @@ case "$target_os" in
 	;;
     cygwin*|mingw*)
 	if test x"$enable_shared" = xyes; then
-	    LIBRUBY_SO='$(RUBY_INSTALL_NAME).'$target_os.dll
+	    RUBY_SO_NAME='$(RUBY_INSTALL_NAME).'$target_os
+	    LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
 	    LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
 	else
 	    LIBRUBY_SO=dummy
@@ -861,6 +863,7 @@ esac
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
+AC_SUBST(RUBY_SO_NAME)
 AC_SUBST(LIBRUBY_A)
 AC_SUBST(LIBRUBY_SO)
 AC_SUBST(LIBRUBY_ALIASES)
diff -pruPX ./.excludes current/cygwin/GNUmakefile.in devel/cygwin/GNUmakefile.in
--- current/cygwin/GNUmakefile.in	Thu Aug  3 18:50:40 2000
+++ devel/cygwin/GNUmakefile.in	Fri Aug  4 13:05:40 2000
@@ -14,23 +14,23 @@ else
 endif
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_INSTALL_NAME).def
-SOLIBS := $(RUBY_INSTALL_NAME).dll.res.o $(SOLIBS)
-EXTOBJS += $(@:$(EXEEXT)=.res.o)
+SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS)
+EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
 
-$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_INSTALL_NAME).dll.res.o
+$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@
 $(LIBRUBY): $(LIBRUBY_SO)
 
-%.res.o: %.rc
+%.res.@OBJEXT@: %.rc
 	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_INSTALL_NAME).dll.rc: rbconfig.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
 	@@MINIRUBY@ $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-	  -so_name=$(RUBY_INSTALL_NAME).dll \
+ 	  -so_name=$(LIBRUBY_SO) \
 	  . $(icondirs) $(srcdir)/win32
 
-$(PROGRAM): $(RUBY_INSTALL_NAME).res.o
-$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.o
+$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
+$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	@rm -f $@
 	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
diff -pruPX ./.excludes current/win32/resource.rb devel/win32/resource.rb
--- current/win32/resource.rb	Thu Aug  3 18:55:54 2000
+++ devel/win32/resource.rb	Fri Aug  4 09:33:03 2000
--- current/win32/resource.rb	Thu Aug  3 18:55:54 2000
+++ devel/win32/resource.rb	Fri Aug  4 13:10:24 2000
@@ -8,7 +8,7 @@ fversion = "#{CONFIG['MAJOR']},#{CONFIG[
 
 $ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
 $rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
-$so_name ||= CONFIG["RUBY_SO_NAME"]
+$so_name ||= CONFIG["RUBY_SO_NAME"] + '.dll'
 
 icons = {}
 def icons.find(path)
@@ -49,7 +49,7 @@ end
 [ # base name    extension         file type  icons
   [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
   [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
-  [$so_name, '.'+CONFIG["DLEXT2"], 'VFT_DLL', dll_icons],
+  [$so_name,     '',               'VFT_DLL', dll_icons],
 ].each do |base, ext, type, icons|
   open(base + '.rc', "w") { |f|
     f.binmode if /mingw/ =~ RUBY_PLATFORM


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦