diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-20 15:08:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-20 15:08:36 +0000 |
| commit | 514df9097eaca61ba9cddf1da6692af8be51ac2a (patch) | |
| tree | ff7bc62049be60f28500e12eff68501516f8d02f | |
| parent | 5c6e6441966c41135a1d08c32b177748d9c15e2d (diff) | |
* lib/mkmf.rb (create_makefile): support platforms have file separator
other than /.
* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
of building platform.
* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 3 | ||||
| -rw-r--r-- | lib/mkmf.rb | 12 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rw-r--r-- | wince/Makefile.sub | 3 |
5 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Thu Apr 21 00:07:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): support platforms have file separator + other than /. + + * {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator + of building platform. + + * {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command. + Wed Apr 20 23:22:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, common.mk: miniruby depens on MINIOBJS. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 6f9e7242b1..17db6937e8 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -286,6 +286,7 @@ config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk @type > $@ &&| # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t +s,@BUILD_FILE_SEPARATOR@,\,;t t s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t @@ -331,6 +332,8 @@ s,@AR@,$(AR),;t t s,@ARFLAGS@,$(ARFLAGS) ,;t t s,@LN_S@,$(LN_S),;t t s,@SET_MAKE@,$(SET_MAKE),;t t +s,@CP@,copy > nul,;t t +s,@INSTALL@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 07017597ca..3476dcdf48 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1038,7 +1038,17 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} files.each do |f| dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb#{sfx}: #{dest}\n") - mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} #{dir}\n") + mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") + sep = config_string('BUILD_FILE_SEPARATOR') + if sep + f = f.gsub("/", sep) + sep = ":/="+sep + f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} + f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} + else + sep = "" + end + mfile.print("#{f} $(@D#{sep})\n") end end end diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 56122891d8..f29eb57830 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -301,6 +301,7 @@ config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk @exit <<$@ # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t +s,@BUILD_FILE_SEPARATOR@,\,;t t s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t @@ -346,6 +347,8 @@ s,@AR@,$(AR),;t t s,@ARFLAGS@,$(ARFLAGS),;t t s,@LN_S@,$(LN_S),;t t s,@SET_MAKE@,$(SET_MAKE),;t t +s,@CP@,copy > nul,;t t +s,@INSTALL@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 74cb43f1e1..77a47ff8f0 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -309,6 +309,7 @@ config.status: $(MKFILES) $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk @exit <<$@ # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t +s,@BUILD_FILE_SEPARATOR@,\,;t t s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t @@ -354,6 +355,8 @@ s,@AR@,$(AR),;t t s,@ARFLAGS@,$(ARFLAGS),;t t s,@LN_S@,$(LN_S),;t t s,@SET_MAKE@,$(SET_MAKE),;t t +s,@CP@,copy > nul,;t t +s,@INSTALL@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t |