From 2bcf3e226dbcbe8fc1ac601b0d17bdebc9617e2f Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Mon, 20 Jul 2015 03:29:25 +0200
Subject: [PATCH] move RIncludes install location, convert line endings

---
 build-toolchain.sh               |  2 +-
 cmake/retro68.toolchain.cmake.in |  2 +-
 prepare-rincludes.sh             | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 prepare-rincludes.sh

diff --git a/build-toolchain.sh b/build-toolchain.sh
index 0dd4442324..7dbed076af 100644
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -62,7 +62,7 @@ cd ..
 sh "$SRC/prepare-headers.sh" "$SRC/CIncludes" toolchain/m68k-unknown-elf/include
 
 mkdir -p toolchain/RIncludes
-cp $SRC/RIncludes/*.r toolchain/RIncludes/
+sh "$SRC/prepare-rincludes.sh" "$SRC/RIncludes" toolchain/m68k-unknown-elf/RIncludes
 
 mkdir -p build-host
 cd build-host
diff --git a/cmake/retro68.toolchain.cmake.in b/cmake/retro68.toolchain.cmake.in
index b76396f2da..ecba04c4cb 100644
--- a/cmake/retro68.toolchain.cmake.in
+++ b/cmake/retro68.toolchain.cmake.in
@@ -23,7 +23,7 @@ set( CMAKE_INSTALL_PREFIX "${RETRO68_ROOT}/m68k-unknown-elf/" CACHE PATH "instal
 
 set( MAKE_APPL "${RETRO68_ROOT}/bin/MakeAPPL" )
 set( REZ "${RETRO68_ROOT}/bin/Rez" )
-set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/RIncludes" )
+set( REZ_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/RIncludes" )
 
 set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-gcc" )
 set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/m68k-unknown-elf-g++" )
diff --git a/prepare-rincludes.sh b/prepare-rincludes.sh
new file mode 100644
index 0000000000..36e47f3d9e
--- /dev/null
+++ b/prepare-rincludes.sh
@@ -0,0 +1,11 @@
+IN=$1
+OUT=$2
+
+# Make Mac OS X's tr and sed not complain that the files are not UTF-8
+export LANG=en
+
+# cp $IN/[A-Z]*.r $OUT/
+for file in $(cd $IN; ls [A-Z]*.r); do
+	tr '\r' '\n' < $IN/$file > $OUT/$file
+done
+