From f807162d3441490852c1c129f21bdb4e26fbb322 Mon Sep 17 00:00:00 2001
From: Jamie Jennings <jjennings@us.ibm.com>
Date: Tue, 29 Nov 2016 09:32:23 -0500
Subject: [PATCH] Updated libffi and samples to new submodules directory

---
 ffi/librosie/Makefile   | 12 ++++++------
 ffi/librosie/librosie.c |  4 ++--
 ffi/samples/go/setup.sh |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ffi/librosie/Makefile b/ffi/librosie/Makefile
index b3db384..c694e28 100644
--- a/ffi/librosie/Makefile
+++ b/ffi/librosie/Makefile
@@ -1,4 +1,4 @@
-## -*- Mode: BSDmakefile; -*-                                         
+## -*- Mode: Makefile; -*-                                             
 ##
 ## Makefile for building librosie.so, on which Rosie's foreign function interface is based. 
 ##
@@ -8,8 +8,8 @@
 
 ## Use "DEBUG=1" on the command line to enable verbose debugging output
 
-HOME = `cd ../..; pwd`
-ROSIE = "$(HOME)/rosie"
+HOME = $(shell cd ../..; pwd)
+ROSIE = "$(HOME)/bin/rosie"
 
 ifdef DEBUG
 COPT = "-DDEBUG"
@@ -39,12 +39,12 @@ SYSCFLAGS=
 SYSLDFLAGS=
 SYSLIBS=
 
-MYCFLAGS=  -I$(HOME)/tmp/lua-5.3.2/include
-MYLDFLAGS= -L$(HOME)/tmp/lua-5.3.2/src
+MYCFLAGS=  -I$(HOME)/submodules/lua/include
+MYLDFLAGS= -L$(HOME)/submodules/lua/src
 MYLIBS= 
 MYOBJS=
 
-LUA_A=	$(HOME)/tmp/lua-5.3.2/src/liblua.a
+LUA_A=	$(HOME)/submodules/lua/src/liblua.a
 
 ALL= librosie.so
 
diff --git a/ffi/librosie/librosie.c b/ffi/librosie/librosie.c
index 9436f6c..102fb79 100644
--- a/ffi/librosie/librosie.c
+++ b/ffi/librosie/librosie.c
@@ -77,9 +77,9 @@
  * ----------------------------------------------------------------------------------------
  */
 
-/* TODO: First try to load bin/bootstrap.luac and then fall back to src/bootstrap.lua */
+/* TODO: First try to load bin/bootstrap.luac and then fall back to src/core/bootstrap.lua */
 static int bootstrap (lua_State *L, struct string *rosie_home) {
-     const char *bootscript = "/src/bootstrap.lua";
+     const char *bootscript = "/src/core/bootstrap.lua";
      LOG("About to bootstrap\n");
      char *name = malloc(rosie_home->len + strlen(bootscript) + 1);
      memcpy(name, rosie_home->ptr, rosie_home->len);
diff --git a/ffi/samples/go/setup.sh b/ffi/samples/go/setup.sh
index 2d22fa7..0e5632e 100755
--- a/ffi/samples/go/setup.sh
+++ b/ffi/samples/go/setup.sh
@@ -13,7 +13,7 @@ ln -fs $LIB/librosie_gen.h src/rtest/include/librosie_gen.h
 ln -fs $LIB/librosie_gen.c src/rtest/include/librosie_gen.c
 
 echo "Creating 'libs' directory in 'src/rtest' and symlink to liblua"
-LIB=`cd ../../../tmp/lua-5.3.2/src && pwd`
+LIB=`cd ../../../submodules/lua/src && pwd`
 mkdir -p src/rtest/libs
 ln -fs $LIB/liblua.a src/rtest/libs/liblua.a