----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit 笠原です。 * From: Motoyuki Kasahara <m-kasahr / sra.co.jp> * Date: Sat, 14 Nov 1998 10:01:19 +0900 > これで良ければ、パッチを作ります。 「よければ」の確認を待たずに、とりあえず作ってみました。 まずは、pkglibdir と libdir を分離するだけのパッチと ChangeLog です。 ----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=ruby-1.1c7.diff --- instruby.rb.ORG Mon Oct 19 15:01:02 1998 +++ instruby.rb.new Sat Nov 14 10:47:51 1998 @@ -14,8 +14,9 @@ end ruby_install_name ONFIG["ruby_install_name"] bindir ONFIG["bindir"] -libdir ONFIG["libdir"] + "/" + ruby_install_name -archdir ibdir+"/"+CONFIG["arch"] +libdir ONFIG["libdir"] +pkglibdir ibdir + "/" + ruby_install_name +archdir kglibdir + "/" + CONFIG["arch"] mandir ONFIG["mandir"] + "/man1" wdir ir.getwd @@ -25,20 +26,21 @@ for dll in Dir['*.dll'] File.install dll, "#{bindir}/#{dll}", 0755, TRUE end -File.makedirs "#{libdir}", TRUE +File.makedirs libdir, TRUE for lib in ["libruby.so", "libruby.so.LIB"] if File.exist? lib File.install lib, "#{libdir}", 0644, TRUE end end -File.makedirs libdir, TRUE +File.makedirs pkglibdir, TRUE +File.makedirs archdir, TRUE Dir.chdir "ext" system "../miniruby#{binsuffix} extmk.rb install" Dir.chdir CONFIG["srcdir"] IO.foreach 'MANIFEST' do |$_| $_.chop! if /^lib/ - File.install $_, "#{libdir}", 0644, TRUE + File.install $_, "#{pkglibdir}", 0644, TRUE elsif /^[a-z]+\.h$/ File.install $_, "#{archdir}", 0644, TRUE end ----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=ChangeLog Sat Nov 14 10:56:55 1998 Motoyuki Kasahara <m-kasahr / sra.co.jp> * instruby.rb: Add the variable `pkglibdir'. * instruby.rb: Set the variable `libdir' to `$(libdir)', not `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB' are installed at `libdir'. * instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'. ----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit 次に libdir, pkglibdir の分離と、DESTDIR 対応の両方を含めたパッチと ChangeLog です。 ----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=ruby-1.1c7.diff2 --- ./ext/extmk.rb.in.ORG Mon Oct 19 15:01:02 1998 +++ ./ext/extmk.rb.in Sat Nov 14 10:28:34 1998 @@ -8,6 +8,7 @@ ARGV.shift elsif ARGV[0] 'install' $install RUE + $destdir RGV[1] || '' ARGV.shift elsif ARGV[0] 'clean' $clean RUE @@ -113,10 +114,10 @@ end for f in dir next if f "." - mfile.printf "\t@test -d $(libdir)/%s || mkdir $(libdir)/%s\n", f, f + mfile.printf "\t@test -d $(DESTDIR)$(libdir)/%s || mkdir $(DESTDIR)$(libdir)/%s\n", f, f end for f in path - mfile.printf "\t$(INSTALL_DATA) lib/%s $(libdir)/%s\n", f, f + mfile.printf "\t$(INSTALL_DATA) lib/%s $(DESTDIR)$(libdir)/%s\n", f, f end end @@ -332,12 +333,12 @@ mfile.printf "\ install: - @test -d $(libdir) || mkdir $(libdir) - @test -d $(archdir) || mkdir $(archdir) + @test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir) + @test -d $(DESTDIR)$(archdir) || mkdir $(DESTDIR)$(archdir) " if !$static mfile.printf "\ - $(INSTALL) $(TARGET) $(archdir)/$(TARGET) + $(INSTALL) $(TARGET) $(DESTDIR)$(archdir)/$(TARGET) " end install_rb(mfile) @@ -433,7 +434,7 @@ $extlist.push [$static,target] end if $install - system "make install" + system "make install DESTDIR $destdir}" elsif $clean system "make clean" else --- ./instruby.rb.ORG Mon Oct 19 15:01:02 1998 +++ ./instruby.rb Sat Nov 14 10:48:09 1998 @@ -3,6 +3,8 @@ require "rbconfig.rb" include Config +destdir RGV[0] || '' + $:.unshift CONFIG["srcdir"]+"/lib" require "ftools" @@ -14,38 +16,40 @@ end ruby_install_name ONFIG["ruby_install_name"] bindir ONFIG["bindir"] -libdir ONFIG["libdir"] + "/" + ruby_install_name -archdir ibdir+"/"+CONFIG["arch"] +libdir ONFIG["libdir"] +pkglibdir ibdir + "/" + ruby_install_name +archdir kglibdir + "/" + CONFIG["arch"] mandir ONFIG["mandir"] + "/man1" wdir ir.getwd -File.makedirs bindir, TRUE +File.makedirs "#{destdir}#{bindir}", TRUE File.install "ruby#{binsuffix}", - "#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, TRUE + "#{destdir}#{bindir}/#{ruby_install_name}#{binsuffix}", 0755, TRUE for dll in Dir['*.dll'] - File.install dll, "#{bindir}/#{dll}", 0755, TRUE + File.install dll, "#{destdir}#{bindir}/#{dll}", 0755, TRUE end -File.makedirs "#{libdir}", TRUE +File.makedirs "#{destdir}#{libdir}", TRUE for lib in ["libruby.so", "libruby.so.LIB"] if File.exist? lib - File.install lib, "#{libdir}", 0644, TRUE + File.install lib, "#{destdir}#{libdir}", 0644, TRUE end end -File.makedirs libdir, TRUE +File.makedirs "#{destdir}#{pkglibdir}", TRUE +File.makedirs "#{destdir}#{archdir}", TRUE Dir.chdir "ext" -system "../miniruby#{binsuffix} extmk.rb install" +system "../miniruby#{binsuffix} extmk.rb install #{destdir}" Dir.chdir CONFIG["srcdir"] IO.foreach 'MANIFEST' do |$_| $_.chop! if /^lib/ - File.install $_, "#{libdir}", 0644, TRUE + File.install $_, "#{destdir}#{pkglibdir}", 0644, TRUE elsif /^[a-z]+\.h$/ - File.install $_, "#{archdir}", 0644, TRUE + File.install $_, "#{destdir}#{archdir}", 0644, TRUE end end -File.makedirs mandir, TRUE -File.install "ruby.1", "#{mandir}", 0644, TRUE +File.makedirs "#{destdir}#{mandir}", TRUE +File.install "ruby.1", "#{destdir}#{mandir}", 0644, TRUE Dir.chdir wdir -File.install "config.h", "#{archdir}", 0644, TRUE -File.install "rbconfig.rb", "#{archdir}", 0644, TRUE +File.install "config.h", "#{destdir}#{archdir}", 0644, TRUE +File.install "rbconfig.rb", "#{destdir}#{archdir}", 0644, TRUE # vi:set sw --- ./Makefile.in.ORG Mon Oct 19 15:01:02 1998 +++ ./Makefile.in Sat Nov 14 10:24:31 1998 @@ -90,7 +90,7 @@ $(LDSHARED) $(DLDFLAGS) $(SOLIBS) $(OBJS) dmyext.o -o $@ install: rbconfig.rb - ./miniruby$(binsuffix) $(srcdir)/instruby.rb + ./miniruby$(binsuffix) $(srcdir)/instruby.rb $(DESTDIR) clean:; @rm -f $(OBJS) $(LIBRUBY) $(MAINOBJ) rbconfig.rb @rm -f ext/extinit.c ext/extinit.o dmyext.o ----Next_Part(Sat_Nov_14_11:21:22_1998_809)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=ChangeLog2 Sat Nov 14 11:02:05 1998 Motoyuki Kasahara <m-kasahr / sra.co.jp> * Makefile.in (install): Give the argument `$(DESTDIR)' to `instruby.rb'. * instruby.rb: Recognize ARG[0] as `destdir'. * instruby.rb: Give the argument `destdir' to `extmk.rb'. * ext/extmk.rb.in: Recognize ARG[1] as `$destdir'. * instruby.rb: Create the installation directories (bindir, libdir, archdir, pkglibdir, archdir, and mandir) under `destdir', and install all files under there. * ext/extmk.rb.in: Likewise. Sat Nov 14 10:56:55 1998 Motoyuki Kasahara <m-kasahr / sra.co.jp> * instruby.rb: Add the variable `pkglibdir'. * instruby.rb: Set the variable `libdir' to `$(libdir)', not `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB' are installed at `libdir'. * instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'. ----Next_Part(Sat_Nov_14_11:21:22_1998_809)----