Index: Make.inc.in
--- Make.inc.in.orig	2010-05-24 07:40:58.000000000 +0200
+++ Make.inc.in	2010-05-24 23:54:11.000000000 +0200
@@ -15,7 +15,7 @@
 docdir		= @docdir@
 mandir		= @mandir@
 datadir		= @datadir@
-dictdir		= $(datadir)/freeradius
+dictdir		= $(datadir)
 logdir		= @logdir@
 includedir	= @includedir@
 raddbdir	= @raddbdir@
@@ -49,7 +49,7 @@
 
 LOGDIR		= ${logdir}
 RADDBDIR	= ${raddbdir}
-RUNDIR		= ${localstatedir}/run/radiusd
+RUNDIR		= ${localstatedir}
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig	2010-05-24 07:40:58.000000000 +0200
+++ raddb/radiusd.conf.in	2010-05-24 23:54:11.000000000 +0200
@@ -66,7 +66,7 @@
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
-run_dir = ${localstatedir}/run/${name}
+run_dir = ${localstatedir}
 
 # Should likely be ${localstatedir}/lib/radiusd
 db_dir = ${raddbdir}
Index: src/main/event.c
--- src/main/event.c.orig	2010-05-24 07:40:58.000000000 +0200
+++ src/main/event.c	2010-05-25 08:53:57.000000000 +0200
@@ -74,7 +74,9 @@
 #define PTHREAD_MUTEX_LOCK if (have_children) pthread_mutex_lock
 #define PTHREAD_MUTEX_UNLOCK if (have_children) pthread_mutex_unlock
 
+#if defined(HAVE_PTHREAD_H)
 static pthread_t NO_SUCH_CHILD_PID;
+#endif
 #else
 /*
  *	This is easier than ifdef's throughout the code.
