* configure.in: modify program_prefix only if specified

  --program-prefix.

* configure.in: don't generate ext/extmk.rb.

* Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
  remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.

* {win32,bccwin32}/Makefile.sub: ditto.

* instruby.rb: ditto.

* ext/extmk.rb: renamed from ext/extmk.rb.in.

* lib/mkmf.rb (module Logging): create log files (mkmf.log)
  in each extension module directories.

* ext/extmk.rb: ditto.

* lib/mkmf.rb (macro_defined?): new method.

* ext/.cvsignore: remove extmk.rb.

* ext/*/.cvsignore: add "*.def".


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,30 @@
+Sun Sep  8 14:38:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: modify program_prefix only if specified
+	  --program-prefix.
+
+	* configure.in: don't generate ext/extmk.rb.
+
+	* Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
+	  remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.
+
+	* {win32,bccwin32}/Makefile.sub: ditto.
+
+	* instruby.rb: ditto.
+
+	* ext/extmk.rb: renamed from ext/extmk.rb.in.
+
+	* lib/mkmf.rb (module Logging): create log files (mkmf.log)
+	  in each extension module directories.
+
+	* ext/extmk.rb: ditto.
+
+	* lib/mkmf.rb (macro_defined?): new method.
+
+	* ext/.cvsignore: remove extmk.rb.
+
+	* ext/*/.cvsignore: add "*.def".
+
 Sun Sep  8 14:36:40 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
 
 	* bcc32/configure.bat : Control of a message.

MANIFEST

@@ -99,7 +99,7 @@ ext/Setup.nt
 ext/Setup.x68
 ext/aix_mksym.rb
 ext/configsub.rb
-ext/extmk.rb.in
+ext/extmk.rb
 lib/English.rb
 lib/Env.rb
 lib/README

Makefile.in

@@ -84,7 +84,7 @@ OBJS	      = array.@OBJEXT@ \
 		$(MISSING)
 
 all:		miniruby$(EXEEXT) @PREP@ rbconfig.rb $(LIBRUBY)
-		@@MINIRUBY@ -Cext extmk.rb @EXTSTATIC@
+		@@MINIRUBY@ $(srcdir)/ext/extmk.rb @EXTSTATIC@
 
 miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
 		@rm -f $@
@@ -107,7 +107,7 @@ $(LIBRUBY_SO):	$(OBJS) dmyext.@OBJEXT@ miniruby$(EXEEXT)
 install:	rbconfig.rb
 		@MINIRUBY@ $(srcdir)/instruby.rb $(DESTDIR)
 
-clean-ext:;	@-@MINIRUBY@ -Cext extmk.rb clean 2> /dev/null || true
+clean-ext:;	@-@MINIRUBY@ $(srcdir)/ext/extmk.rb clean 2> /dev/null || true
 
 clean-local:
 		@rm -f $(OBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES)
@@ -117,10 +117,10 @@ clean-local:
 clean: clean-ext clean-local
 
 distclean-ext:
-		@-@MINIRUBY@ -Cext extmk.rb distclean 2> /dev/null || true
+		@-@MINIRUBY@ $(srcdir)/ext/extmk.rb distclean 2> /dev/null || true
 
 distclean-local: clean-local
-		@rm -f Makefile ext/extmk.rb config.h rbconfig.rb
+		@rm -f Makefile config.h rbconfig.rb
 		@rm -f ext/config.cache config.cache config.log config.status
 		@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
 

bcc32/Makefile.sub

@@ -165,9 +165,9 @@ OBJS          = array.obj \
 		version.obj \
 		$(MISSING)
 
-all:		miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
+all:		miniruby$(EXEEXT) rbconfig.rb \
 		$(LIBRUBY) $(MISCLIBS)
-		@.\miniruby$(EXEEXT) -Cext extmk.rb 
+		@.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb 
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
@@ -324,6 +324,7 @@ s,@DLEXT2@,dll,;t t
 s,@STRIP@,$(STRIP),;t t
 s,@EXTSTATIC@,$(EXTSTATIC),;t t
 s,@setup@,Setup,;t t
+s,@MINIRUBY@,$(MINIRUBY),;t t
 s,@LIBRUBY_LDSHARED@,$(LIBRUBY_LDSHARED),;t t
 s,@LIBRUBY_DLDFLAGS@,$(LIBRUBY_DLDFLAGS),;t t
 s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
@@ -345,13 +346,13 @@ s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 |
 
-ext/extmk.rb:	$(srcdir)ext/extmk.rb.in config.status
-		@echo Creating ext/extmk.rb
-		@.\miniruby$(EXEEXT) $(srcdir)ext/configsub.rb \
-			-srcdir=$(srcdir) \
-			-install_name=$(RUBY_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) \
-			-output=$@ $(srcdir)ext/extmk.rb.in
+#ext/extmk.rb:	$(srcdir)ext/extmk.rb.in config.status
+#		@echo Creating ext/extmk.rb
+#		@.\miniruby$(EXEEXT) $(srcdir)ext/configsub.rb \
+#			-srcdir=$(srcdir) \
+#			-install_name=$(RUBY_INSTALL_NAME) \
+#			-so_name=$(RUBY_SO_NAME) \
+#			-output=$@ $(srcdir)ext/extmk.rb.in
 
 miniruby$(EXEEXT):	$(OBJS) $(MAINOBJ) $(EXTOBJS) 
 		@echo $(EXTOBJS)
@@ -396,13 +397,12 @@ clean-local:
 		@if exist *.tds del *.tds
 
 clean-ext:
-		@-.\miniruby$(EXEEXT) -Cext extmk.rb clean
+		@-.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb clean
 
 distclean:	distclean-ext distclean-local
 
 distclean-local:	clean-local
 		@if exist Makefile del Makefile
-		@if exist ext\extmk.rb del ext\extmk.rb
 		@if exist config.h del config.h
 		@if exist ext\config.cache del ext\config.cache
 		@if exist config.cache del config.cache
@@ -432,7 +432,7 @@ distclean-local:	clean-local
 		@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
 
 distclean-ext:
-		@-.\miniruby$(EXEEXT) -Cext extmk.rb distclean
+		@-.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb distclean
 
 realclean:	distclean
 		@if exist parse.c del parse.c

configure.in

@@ -27,6 +27,9 @@ then
 (it is also a good idea to do 'make clean' before compiling))
 fi
 
+if test "$program_prefix" = NONE; then
+  program_prefix=
+fi
 AC_CANONICAL_TARGET
 
 dnl checks for fat-binary
@@ -1172,5 +1175,5 @@ else
 fi
 : > confdefs.h
 
-AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile ext/extmk.rb])
+AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile])
 AC_OUTPUT

ext/.cvsignore

@@ -1,3 +1,2 @@
 extinit.c
-extmk.log
-extmk.rb
+*.log

ext/Win32API/.cvsignore

@@ -1 +1,3 @@
 Makefile
+*.log
+*.def

ext/curses/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/dbm/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/digest/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/digest/md5/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/digest/rmd160/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/digest/sha1/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/digest/sha2/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def

ext/dl/.cvsignore

@@ -5,3 +5,4 @@ dlconfig.rb
 *.func
 *.o
 *~
+*.def

ext/etc/.cvsignore

@@ -1,2 +1,3 @@
 Makefile
 mkmf.log
+*.def