[Gridflow-cvs] [svn] commit: r6850 - in /trunk: Makefile configure

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed Nov 23 00:01:16 EST 2011


Author: matju
Date: Wed Nov 23 00:01:16 2011
New Revision: 6850

Log:
use same ruby to build as was used to configure

Modified:
    trunk/Makefile
    trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Nov 23 00:01:16 2011
@@ -2,10 +2,10 @@
 
 # pexports /c/Program\ Files/pd/extra/Gem/Gem.dll > Gem.def
 
+RUBY = ruby_not_defined
 include config.make
 COMMON_DEPS = config.make Makefile src/source_filter.rb
 COMMON_DEPS2 = $(COMMON_DEPS) src/gridflow.hxx.fcs
-RUBY = ruby
 
 SHELL = /bin/sh
 RM = rm -f

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Nov 23 00:01:16 2011
@@ -516,6 +516,7 @@
 DUAL.puts Light,"generating ./config.make and ./config.h"
 
 File.open("./config.make","w") {|f|
+  f.puts "RUBY = "+CONFIG["bindir"]+"/"+CONFIG["RUBY_INSTALL_NAME"]
   if DEFINES["CPU"]
     CFLAGS << (if DEFINES["GCC_VERSION"] >= "4" then " -mtune=$(CPU)" else " -mcpu=$(CPU)" end)
     CFLAGS << " -march=$(CPU)"



More information about the Gridflow-cvs mailing list