diff -Nurd -x'*~' gkrellm-2.3.5.orig/server/Makefile gkrellm-2.3.5/server/Makefile
--- gkrellm-2.3.5.orig/server/Makefile	2010-10-02 12:21:01.000000000 -0400
+++ gkrellm-2.3.5/server/Makefile	2013-03-27 12:57:11.000000000 -0400
@@ -60,7 +60,8 @@
 GLIB12_INCLUDE = `glib-config --cflags`
 GLIB12_LIB = `glib-config --libs glib gmodule`
 
-FLAGS = -O2 $(PKG_INCLUDE)
+FLAGS = -I.. -I$(SHARED_PATH) $(GTOP_INCLUDE) $(PTHREAD_INC) -DGKRELLM_SERVER
+FLAGS += -O2 $(PKG_INCLUDE)
 
 ifeq ($(glib12),1)
     FLAGS = -O2 $(GLIB12_INCLUDE)
@@ -68,7 +69,6 @@
 ifeq ($(glib12),yes)
     FLAGS = -O2  $(GLIB12_INCLUDE)
 endif
-FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
 
 LIBS = $(PKG_LIB)
 ifeq ($(glib12),1)

diff -Nurd -x'*~' gkrellm-2.3.5.orig/server/gkrellmd.h gkrellm-2.3.5/server/gkrellmd.h
--- gkrellm-2.3.5.orig/server/gkrellmd.h	2010-09-14 12:34:34.000000000 -0400
+++ gkrellm-2.3.5/server/gkrellmd.h	2013-03-27 13:05:30.000000000 -0400
@@ -129,9 +129,9 @@
 #if !defined(WIN32)
 	#define GKRELLMD_LOCAL_PLUGINS_DIR	"/usr/local/lib/gkrellm2/plugins-gkrellmd"
 	#if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
-		#define GKRELLMD_SYSTEM_PLUGINS_DIR	"/usr/lib/gkrellm2/plugins-gkrellmd"
+		#define GKRELLMD_SYSTEM_PLUGINS_DIR	"@PREFIX@/lib/gkrellm2/plugins-gkrellmd"
 	#endif
-	#define GKRELLMD_SYS_ETC	"/etc"
+	#define GKRELLMD_SYS_ETC	"@PREFIX@/etc"
 	#define GKRELLMD_LOCAL_ETC	"/usr/local/etc"
 #endif // !defined(WIN32)
 
diff -Nurd -x'*~' gkrellm-2.3.5.orig/src/gkrellm.h gkrellm-2.3.5/src/gkrellm.h
--- gkrellm-2.3.5.orig/src/gkrellm.h	2010-10-02 12:21:01.000000000 -0400
+++ gkrellm-2.3.5/src/gkrellm.h	2013-03-27 12:33:00.000000000 -0400
@@ -135,11 +135,11 @@
 
 #define	LOCAL_THEMES_DIR		"/usr/local/share/gkrellm2/themes"
 #if !defined(SYSTEM_THEMES_DIR)
-#define	SYSTEM_THEMES_DIR		"/usr/share/gkrellm2/themes"
+#define	SYSTEM_THEMES_DIR		"@PREFIX@/lib/gkrellm2/themes"
 #endif
 #define	LOCAL_PLUGINS_DIR		"/usr/local/lib/gkrellm2/plugins"
 #if !defined(SYSTEM_PLUGINS_DIR)
-#define	SYSTEM_PLUGINS_DIR		"/usr/lib/gkrellm2/plugins"
+#define	SYSTEM_PLUGINS_DIR		"@PREFIX@/lib/gkrellm2/plugins"
 #endif
 
 #else

diff -Nurd -x'*~' gkrellm-2.3.5.orig/src/sysdeps/darwin.c gkrellm-2.3.5/src/sysdeps/darwin.c
--- gkrellm-2.3.5.orig/src/sysdeps/darwin.c	2010-10-02 12:21:01.000000000 -0400
+++ gkrellm-2.3.5/src/sysdeps/darwin.c	2013-03-27 12:57:11.000000000 -0400
@@ -450,7 +450,6 @@ gkrellm_sys_disk_read_data(void)
             gkrellm_debug(DEBUG_SYSDEP,
                 "No statistics dict found in storage driver, skipping disk '%s'\n",
                 disk->path);
-            CFRelease(storage_driver_stats);
             IOObjectRelease(storage_driver);
             continue;
         }
--