diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 24 | ||||
| -rw-r--r-- | bcc32/setup.mak | 12 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 23 insertions, 19 deletions
@@ -1,3 +1,7 @@ +Thu Aug 16 04:49:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir. + Thu Aug 16 04:40:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * sprintf.c (rb_f_sprintf): sign bit extension should not be done diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 030a799e99..07c6bc9975 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -135,7 +135,7 @@ MISSING = acosh.obj crypt.obj erf.obj win32.obj STACK = 0x2000000 !endif -XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing +XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing ARFLAGS = /a LD = ilink32 -q -Gn @@ -154,7 +154,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def MINIRUBY = .\miniruby$(EXEEXT) -RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)runruby.rb" --extout="$(EXTOUT)" -- +RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- ORGLIBPATH = $(LIB) @@ -172,8 +172,8 @@ OBJEXT = obj WINMAINOBJ = winmain.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) -.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing -.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing +.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing +.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing .path.y = $(srcdir) .path. = $(srcdir) @@ -181,14 +181,14 @@ MINIOBJS = dmydln.$(OBJEXT) $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\) .rc.res: - $(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\) + $(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\) .y.c: $(YACC) $(YFLAGS) $(<:\=/) sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F) @del y.tab.c -all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk +all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk ruby: $(PROGRAM) rubyw: $(WPROGRAM) @@ -203,8 +203,8 @@ config: config.status config.status: $(CONFIG_H) -$(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub - @$(srcdir:/=\)win32\ifchange.bat config.h &&| +$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub + @$(srcdir:/=\)\win32\ifchange.bat config.h &&| \#define HAVE_SYS_TYPES_H 1 \#define HAVE_SYS_STAT_H 1 \#define HAVE_STDLIB_H 1 @@ -284,7 +284,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub | @exit > $@ -config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk +config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk @echo Creating $@ @type > $@ &&| # Generated automatically by Makefile.sub. @@ -426,14 +426,14 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY): $(LIBRUBY_SO) $(RUBYDEF): $(LIBRUBY_A) $(PREP) - $(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A) + $(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb - @$(MINIRUBY) $(srcdir)win32/resource.rb \ + @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ - . $(icondirs) $(srcdir)win32 + . $(icondirs) $(srcdir)/win32 post-install-ext:: $(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \ diff --git a/bcc32/setup.mak b/bcc32/setup.mak index 1c922c208f..efc15c3ea7 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -1,13 +1,13 @@ # -*- makefile -*- !if "$(srcdir)" != "" -bcc32dir = $(srcdir)bcc32/ +bcc32dir = $(srcdir)/bcc32 !elseif "$(bcc32dir)" == "bcc32/" -srcdir = ./ +srcdir = . !elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)" -srcdir = $(bcc32dir:/bcc32/=/) +srcdir = $(bcc32dir:/bcc32/=) !else -srcdir = $(bcc32dir)../ +srcdir = $(bcc32dir)/.. !endif !ifndef prefix prefix = /usr @@ -122,12 +122,12 @@ $(BANG)endif \# RUBY_INSTALL_NAME = ruby \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) \# 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)\" +\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" \# STACK = 0x2000000 \# LDFLAGS = -S:$$(STACK) \# RFLAGS = $$(iconinc) \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib -$(BANG)include $$(srcdir)bcc32/Makefile.sub +$(BANG)include $$(srcdir)/bcc32/Makefile.sub | @$(srcdir:/=\)\win32\rm.bat config.h config.status @echo type "`$(MAKE)'" to make ruby for $(OS). @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 65 +#define RUBY_PATCHLEVEL 66 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |