From 9fb0fcadd8cbae7ad2018e36bf33bcf5a705871c Mon Sep 17 00:00:00 2001
From: traycold <traycold@gmail.com>
Date: Sun, 4 Mar 2012 23:01:41 +0100
Subject: [PATCH] fixed small type; set compiler variables when using
 scratchbox

---
 Makefile | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 078011392..f916d6bc6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,10 @@ LFSDIR=luafilesystem
 
 CC:=arm-unknown-linux-gnueabi-gcc
 CXX:=arm-unknown-linux-gnueabi-g++
+ifdef SBOX_UNAME_MACHINE
+	CC:=gcc
+	CXX:=g++
+endif
 HOSTCC:=gcc
 HOSTCXX:=g++
 
@@ -25,16 +29,15 @@ CFLAGS:=-O0 -g
 # in that case.
 
 ifdef EMULATE_READER
-CC:=$(HOSTCC)
-CXX:=$(HOSTCXX)
-EMULATE_READER_W?=824
-EMULATE_READER_H?=1200
-EMU_CFLAGS?=$(shell sdl-config --cflags)
-EMU_CFLAGS+= -DEMULATE_READER \
-	     -DEMULATE_READER_W=$(EMULATE_READER_W) \
-	     -DEMULATE_READER_H=$(EMULATE_READER_H) \
-	
-EMU_LDFLAGS?=$(shell sdl-config --libs)
+	CC:=$(HOSTCC)
+	CXX:=$(HOSTCXX)
+	EMULATE_READER_W?=824
+	EMULATE_READER_H?=1200
+	EMU_CFLAGS?=$(shell sdl-config --cflags)
+	EMU_CFLAGS+= -DEMULATE_READER \
+		     -DEMULATE_READER_W=$(EMULATE_READER_W) \
+		     -DEMULATE_READER_H=$(EMULATE_READER_H) \	
+	EMU_LDFLAGS?=$(shell sdl-config --libs)
 endif
 
 # standard includes
@@ -150,7 +153,7 @@ endif
 $(LUALIB):
 	make -C lua/src CC="$(CC)" CFLAGS="$(CFLAGS)" MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E" liblua.a
 
-thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIBS) $(DJVULIBS)
+thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS)
 
 INSTALL_DIR=kindlepdfviewer