[ruby-dev:23034] --prefix and DESTDIR for bccwin32 (Re: Re: [BUG] make distclean が失敗する)

なかだです。

At Tue, 17 Feb 2004 16:03:31 +0900,
H.Yamamoto wrote in [ruby-dev:22935]:
> >--prefix は実際に使用時にブツが置かれるはずの場所を指定し、
> >DESTDIR は単に構成物を一時的にどこかにインストールイメージの
> >構成で配置するために使われます。
> >
> >つまり、--prefix が真のインストール場所指定であり、DESTDIR は
> >例えば実際には真の場所インストールせずにバイナリのパッケージ
> >を作成する、などといった用途に使用します。
> 
> なるほど、よくわかりました。Windows で DESTDIR をインストール
> に使ってたのがイリーガルで、本来は --prefix で指定するもの
> だったんですね。
> 
> bcc32 + ruby1.9 がどうなってるのかは、ちょっとわかりません。
> 普段使ってる e:/ruby に入ってるのは、ruby1.8.1 なので・・・

どうも話がかみあっていないと思ったら、bccwin32が独自のようです。


* bcc32/Makefile.sub, bcc32/README.bcc32, bcc32/configure.bat,
  bcc32/setup.mak: new configure scheme. use ``configure --prefix=dir''
  instead of ``make DESTDIR=dir install''.
  --with-static-linked-ext support on mswin32.


Index: bcc32/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/bcc32/Makefile.sub,v
retrieving revision 1.52
diff -u -2 -p -d -r1.52 Makefile.sub
--- bcc32/Makefile.sub	22 Feb 2004 05:44:35 -0000	1.52
+++ bcc32/Makefile.sub	22 Feb 2004 08:39:53 -0000
@@ -95,7 +95,4 @@ libdir = $(exec_prefix)/lib
 datadir = $(prefix)/share
 !endif
-!ifndef DESTDIR
-DESTDIR = $(prefix)
-!endif
 !ifndef EXTOUT
 EXTOUT = .ext
@@ -314,5 +311,5 @@ s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,,;t t
+s,@prefix@,$(prefix),;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
Index: bcc32/README.bcc32
===================================================================
RCS file: /cvs/ruby/src/ruby/bcc32/README.bcc32,v
retrieving revision 1.2
diff -u -2 -p -d -r1.2 README.bcc32
--- bcc32/README.bcc32	22 Oct 2002 10:54:11 -0000	1.2
+++ bcc32/README.bcc32	23 Feb 2004 00:26:31 -0000
@@ -7,9 +7,5 @@
 (1) Borland C++ 5.0 or later.
 
-(2) If you want to run `((%make clean%))' or `((%make distclean%))'
-    properly, you must install UNIX compatible `((%rm%))' command on
-    your ((|PATH|)).
-
-(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
+(2) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
     to run required commands properly from the command line.
 
@@ -20,8 +16,17 @@
      * ilink
 
+(3) If you want to build from CVS source, following commands are required.
+     * byacc
+     * sed
+
 == How to compile and install
 
 (1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\ruby-1.6.7>bcc32\configure.bat
+     ex. c:\src\ruby> bcc32\configure.bat
+    You can specify the target platform as an argument.
+    For example, run `((%configure i686-bccwin32%))'
+    You can also specify the install directory.
+    For example, run `((%configure --prefix=<install_directory>%))'
+    Default of the install directory is /usr .
      
 (2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
@@ -34,5 +39,5 @@
 (4) Run `((%make test%))'
 
-(5) Run `((%make DESTDIR=<install_directory> install%))'
+(5) Run `((%make install%))'
 
     This command will create following directories and install files onto them.
@@ -47,5 +52,5 @@
       * <install_directory>\man\man1
     If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
-    The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
+    The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
 
 == Icons
@@ -79,8 +84,8 @@ in Japanese, but you can download at lea
     C:
     cd \ruby
-    bcc32\configure
+    bcc32\configure --prefix=/usr/local
     make
     make test
-    make DESTDIR=/usr/local install
+    make install
 
 * Build on the relative directory from the ruby source directory and CPU type 
@@ -97,8 +102,8 @@ in Japanese, but you can download at lea
     mkdir bccwin32
     cd bccwin32
-    ..\bcc32\configure target i386-bccwin32
+    ..\bcc32\configure --prefix=/usr/local
     make
     make test
-    make DESTDIR=/usr/local install
+    make install
 
 * Build on the different drive.
@@ -111,8 +116,8 @@ in Japanese, but you can download at lea
     D:
     cd D:\build\ruby
-    C:\src\ruby\bcc32\configure
+    C:\src\ruby\bcc32\configure --prefix=C:/usr/local
     make
     make test
-    make DESTDIR=C:/usr/local install
+    make install
 
 == Bugs
Index: bcc32/configure.bat
===================================================================
RCS file: /cvs/ruby/src/ruby/bcc32/configure.bat,v
retrieving revision 1.7
diff -u -2 -p -d -r1.7 configure.bat
--- bcc32/configure.bat	9 Feb 2004 08:46:24 -0000	1.7
+++ bcc32/configure.bat	22 Feb 2004 07:26:23 -0000
@@ -9,11 +9,12 @@ echo>> ~tmp~.mak $(conf:\=/): nul
 echo>> ~tmp~.mak 	@del ~tmp~.mak
 echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
-echo>> ~tmp~.mak 	bcc32dir="$(@D)" \
 :loop
 if "%1" == "" goto :end
+if "%1" == "--prefix" goto :prefix
 if "%1" == "--srcdir" goto :srcdir
 if "%1" == "srcdir" goto :srcdir
 if "%1" == "--target" goto :target
 if "%1" == "target" goto :target
+if "%1" == "--with-static-linked-ext" goto :extstatic
 if "%1" == "--program-suffix" goto :suffix
 if "%1" == "--program-name" goto :progname
@@ -30,4 +31,9 @@ goto :loop
   shift
 goto :loop
+:prefix
+  echo>> ~tmp~.mak 	-D"prefix=%2" \
+  shift
+  shift
+goto :loop
 :suffix
   echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \
@@ -46,6 +52,10 @@ goto :loop
 goto :loop
 :target
-  echo>> ~tmp~.mak 	%2 \
+  echo>> ~tmp~.mak 	"%2" \
+  shift
   shift
+goto :loop
+:extstatic
+  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \
   shift
 goto :loop
@@ -72,4 +82,5 @@ goto :loop
 goto :exit
 :end
-echo.>> ~tmp~.mak
+echo>> ~tmp~.mak 	bcc32dir="$(@D)"
 make -s -f ~tmp~.mak
+:exit
Index: bcc32/setup.mak
===================================================================
RCS file: /cvs/ruby/src/ruby/bcc32/setup.mak,v
retrieving revision 1.8
diff -u -2 -p -d -r1.8 setup.mak
--- bcc32/setup.mak	16 Feb 2004 11:30:35 -0000	1.8
+++ bcc32/setup.mak	22 Feb 2004 07:28:48 -0000
@@ -10,5 +10,7 @@ srcdir = $(bcc32dir:/bcc32/=/)
 srcdir = $(bcc32dir)../
 !endif
-
+!if "$(prefix)" == ""
+prefix = /usr
+!endif
 OS = bccwin32
 RT = $(OS)
@@ -34,4 +36,6 @@ alpha-$(OS): -prologue- -alpha- -epilogu
 \#\#\# Makefile for ruby $(OS) \#\#\#
 srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
 |
 	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
@@ -78,5 +82,4 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
 \# RUBY_INSTALL_NAME = ruby
 \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# prefix = /usr
 \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 \# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"


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