ruby-list

笠原です。

* From: Motoyuki Kasahara <m-kasahr@sra.co.jp>
* Date: Sat, 14 Nov 1998 10:01:19 +0900

> これで良ければ、パッチを作ります。

「よければ」の確認を待たずに、とりあえず作ってみました。
まずは、pkglibdir と libdir を分離するだけのパッチと ChangeLog です。

次に libdir, pkglibdir の分離と、DESTDIR 対応の両方を含めたパッチと
その ChangeLog です。

Attachments (4)

ruby-1.1c7.diff (1.13 KB, text/x-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 = CONFIG["ruby_install_name"]
 bindir = CONFIG["bindir"]
-libdir = CONFIG["libdir"] + "/" + ruby_install_name
-archdir = libdir+"/"+CONFIG["arch"]
+libdir = CONFIG["libdir"]
+pkglibdir = libdir + "/" + ruby_install_name
+archdir = pkglibdir + "/" + CONFIG["arch"]
 mandir = CONFIG["mandir"] + "/man1"
 wdir = Dir.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

ChangeLog (343 Bytes, text/plain)

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)'.

ruby-1.1c7.diff2 (3.87 KB, text/plain)

--- ./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 = TRUE
+  $destdir = ARGV[1] || ''
   ARGV.shift
 elsif ARGV[0] == 'clean'
   $clean = TRUE
@@ -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 = ARGV[0] || ''
+
 $:.unshift CONFIG["srcdir"]+"/lib"
 require "ftools"
 
@@ -14,38 +16,40 @@
 end
 ruby_install_name = CONFIG["ruby_install_name"]
 bindir = CONFIG["bindir"]
-libdir = CONFIG["libdir"] + "/" + ruby_install_name
-archdir = libdir+"/"+CONFIG["arch"]
+libdir = CONFIG["libdir"]
+pkglibdir = libdir + "/" + ruby_install_name
+archdir = pkglibdir + "/" + CONFIG["arch"]
 mandir = CONFIG["mandir"] + "/man1"
 wdir = Dir.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=2:
--- ./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

ChangeLog2 (841 Bytes, text/plain)

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)'.

Thread

Prev Next

In This Thread

Prev Next

[#10553] base64.rb — Sinichiro Dezawa <dezawa@...>

[#10554] telnet.rb — Sinichiro Dezawa <dezawa@...>

[#10564] ruby-man-1.1-jp-c0/syntax.html — TEI meiki <tei@...>

[#10580] Re: rskkfep alpha 0.1 — toyofuku@...

[#10589] LoadError on FreeBSD 3.0-RELEASE — gotoken@... (GOTO Kentaro)

[#10598] bug?: private writer can be called — Hiroshi Takenaka <pirozeau@...>

[#10600] Re: Ruby Document Format — m_seki@... (SEKI)

[#10602] ':' — Daisuke Sato <densuke@...2.so-net.ne.jp>

[#10624] メーリングリストに参加 — t.togami@... (Takeo Togami)

[#10639] tgif_expr — aito@...

[#10640] 入会します — Tadashige Morii <m_tada@...>

[#10649] Array.pack — Sinichiro Dezawa <dezawa@...>

[#10665] World Wide grep — toyofuku@...

[#10676] 11/10 tokyo offline meeting — matz@... (Yukihiro Matsumoto)

[#10684] Re: 11/10 tokyo offline meeting — toyofuku@...

[#10690] ruby-mode.el — Takao KAWAMURA <kawamura@...>

[#10694] IMAP via HttpTunnel — Kikutani Makoto <kikutani@...>

[#10697] Re: 11/10 tokyo offline meeting — KIMURA Koichi <kkimura@...>

[#10698] 式の評価順序は ? — Takao KAWAMURA <kawamura@...>

[#10701] bignum and x^4 + y^4 + z^4 — Noritsugu Nakamura <nnakamur@...>

[#10720] Re: 11/10 tokyo offline meeting — greentea@...2.so-net.ne.jp (Tomoyuki Kosimizu)

[#10722] — polygon@... (polygon)

[#10725] ruby-gtk-0.14 — "D.Kanda" <MAP2303@...>

[#10727] Re: 11/10 tokyo offline meeting — SHIROYAMA Takayuki <psi@...>

[#10747] ruby 1.1c7 released — matz@... (Yukihiro Matsumoto)

[#10752] Re: case with Class — toyofuku@...

[#10753] Re: ruby:struct -> ext module -> ruby — toyofuku@...

[#10759] COMPUMODA — greenmanalishi@...

[#10767] HttpTunnelServer shoud be run as root ? — Kikutani Makoto <kikutani@...>

[#10772] Re: 11/10 tokyo offline meeting — ARIMA Yasuhiro <fit0298@...>

[#10780] ring — "D.Kanda" <MAP2303@...>

[#10783] ruby senden? — Noritsugu Nakamura <nnakamur@...>

[#10785] Re: case with Class — toyofuku@...

[#10788] 0th(?) Ruby Conference Report — greentea@...2.so-net.ne.jp (Tomoyuki Kosimizu)

[#10799] make ruby on WinNT with VC++6.0 — Koji Oda <oda@...1.qnes.nec.co.jp>

[#10831] shard-library support by libtool — EGUCHI Osamu <eguchi@...>

[#10836] 文字の型は何？ — "Kozuka Masahiro" <kozuka@...>

[#10847] RE: 文字の型は何？ — "Kozuka Masahiro" <kozuka@...>

[#10848] IO#pos= — Yoshinori Toki <toki@...>

[#10850] patch for mswin32 — 助田 雅紀 <masaki.suketa@...>

[#10856] win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10868] Re: case with Class — Toyofuku <toyofuku@...>

[#10876] Re: REBOL — "MAEDA Shugo" <shugo@...>

[#10877] Re: REBOL — "MAEDA Shugo" <shugo@...>

[#10878] 組み込み関数と同じ名前のクラスメソッド — Yoshiki WADA <wada@...>

[#10879] Re: 組み込み関数と同じ名前 — "MAEDA Shugo" <shugo@...>

[#10892] Re: win32 OLE — Koji Oda <oda@...1.qnes.nec.co.jp>

[#10898] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10899] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10900] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10902] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10904] ruby 1.1c8 released — matz@... (Yukihiro Matsumoto)

[#10910] require error (tkutil.so -> tk.so) — ttate@...

[#10915] mod_ruby? — "MAEDA Shugo" <shugo@...>

[#10938] Re: 0th(?) Ruby Conference Report — 助田 雅紀 <masaki.suketa@...>

[#10949] Re: 0th(?) Ruby Conference Report — 助田 雅紀 <masaki.suketa@...>

[#10951] great ideas — matz@... (Yukihiro Matsumoto)

[#10953] Re: World Wide grep — toyofuku@...

[#10958] Re: 0th(?) Ruby Conference Report — greentea@...2.so-net.ne.jp (Tomoyuki Kosimizu)

[#10965] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10967] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10969] Re: win32 OLE — 助田 雅紀 <masaki.suketa@...>

[#10970] tr の使い方について — "Hirotaka Ishida" <h-ishida@...>

[#10973] gets のクラス — Yoshiki WADA <wada@...>

[#10976] スコープの範囲 — Koji Arai <JCA02266@...>

[#10979] Ruby/Forms (ver 0.5) — ttate@...

[#10984] Re: gets のクラス — 助田 雅紀 <masaki.suketa@...>

[#10992] Re: case with Class — "豊福" <toyofuku@...>

[#11001] 文字列の抽出について — "Hirotaka Ishida" <h-ishida@...>

[#11006] usage of TkcImage class — Noritsugu Nakamura <nnakamur@...>

[#11009] GD::Polygon.length mismatch — Noritsugu Nakamura <nnakamur@...>

[#11015] バックスラッシュのエスケープ — Yoshiki WADA <wada@...>

[#11018] ruby/tk FAQ? — Noritsugu Nakamura <nnakamur@...>

[#11022] cgi-lib.rb — Sinichiro Dezawa <dezawa@...>

[#11026] Re: make ruby on WinNT with VC++6.0 — Koji Oda <oda@...1.qnes.nec.co.jp>

[#11031] Linux Japan Jan., 1999 — ozawa@...

[#11035] inspect, to_s — "D.Kanda" <MAP2303@...>

[#11043] enumerable.rb — Shin-ichro Hara <sinara@...>

[#11044] Ruby on SAL — aito@...

[#11046] 宴会サーバ改め会合調整サーバ — hisanori@...

[#10850] patch for mswin32 — 助田　雅紀 <masaki.suketa@...>

[#10856] win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10898] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10899] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10900] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10902] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10938] Re: 0th(?) Ruby Conference Report — 助田　雅紀 <masaki.suketa@...>

[#10949] Re: 0th(?) Ruby Conference Report — 助田　雅紀 <masaki.suketa@...>

[#10965] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10967] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10969] Re: win32 OLE — 助田　雅紀 <masaki.suketa@...>

[#10984] Re: gets のクラス — 助田　雅紀 <masaki.suketa@...>

[#11108] RE: 日本語の配列の内容を１字ずつ取り出す方法について — 助田　雅紀 <masaki.suketa@...>

[#11129] RE: — 助田　雅紀 <masaki.suketa@...>