2 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 61428623..be889ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,9 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 
 # --- Clean and Default ---
 
-all: $(THIRD_LIBS) $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY) $(JSTARGETS)
+all: all-nojs $(JSTARGETS)
+
+all-nojs: $(THIRD_LIBS) $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 
 clean:
 	rm -rf $(OUT)
diff --git a/Makethird b/Makethird
index 36d83a13..290c612d 100644
--- a/Makethird
+++ b/Makethird
@@ -25,9 +25,16 @@ V8LIB_CHOICE := debug
 endif
 
 # If you are building for 32bit linux use V8_ARCH=ia32
+# MacOSX has a 64bit kernel, but a 32 bit userspace.
+ifeq "$(OS)" "Darwin"
+V8_ARCH ?= ia32
+V8_DIR ?= out-mac
+else
 V8_ARCH ?= x64
+V8_DIR ?= out
+endif
 
-V8LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp
+V8LIBS = -L$(V8_DIR)/$(V8_DIR)/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp
 
 V8_PRESENT := 1
 else