From d1c516f4beb47e79fb886e46a4b6e0cf432d850a Mon Sep 17 00:00:00 2001
From: James Snyder <jbsnyder@fanplastic.org>
Date: Wed, 3 Mar 2010 18:19:20 -0600
Subject: Changes to compile on OS X.

- BSD version of install doesn't have -D flag
- stdlib.h should include malloc defs (malloc.h is obsolete)
---
 Makefile           | 6 ++++--
 src/buffer_event.c | 2 +-
 src/event_buffer.c | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index be58b48..22ba6d0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,10 @@ all:
 	$(CC) $(LDFLAGS) -o $(LIB) *.o -L$(LUA_LIB_DIR) -l$(LUA_LIB) -levent
 
 install: all
-	$(INSTALL_DATA) -D lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
-	$(INSTALL_PROGRAM) -D $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
+	mkdir -p $(DESTDIR)$(INSTALL_DIR_LUA)
+	$(INSTALL_DATA) lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
+	mkdir -p $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/
+	$(INSTALL_PROGRAM) $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
 
 clean:
 	rm *.so
diff --git a/src/buffer_event.c b/src/buffer_event.c
index deb1963..70b726c 100644
--- a/src/buffer_event.c
+++ b/src/buffer_event.c
@@ -1,9 +1,9 @@
 /* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
  * Licensed as LGPL - See doc/COPYING for details */
+#include <stdlib.h>
 #include "buffer_event.h"
 #include "utility.h"
 #include <lauxlib.h>
-#include <malloc.h>
 #include "event_buffer.h"
 
 #define BUFFER_EVENT_MT "BUFFER_EVENT_MT"
diff --git a/src/event_buffer.c b/src/event_buffer.c
index ea66a94..a61c643 100644
--- a/src/event_buffer.c
+++ b/src/event_buffer.c
@@ -1,9 +1,8 @@
 /* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
  * Licensed as LGPL - See doc/COPYING for details */
-
+#include <stdlib.h>
 #include "event_buffer.h"
 #include <lauxlib.h>
-#include <malloc.h>
 
 #define EVENT_BUFFER_MT "EVENT_BUFFER_MT"
 
-- 
cgit v1.2.3