--- tcpproxy.c	Sun Apr  4 23:30:30 2004
+++ tcpproxy.c.new	Thu May 27 17:10:28 2004
@@ -87,7 +87,7 @@
 #include <unistd.h>
 
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <errno.h>
 #include <ctype.h>
 #include <pwd.h>
@@ -105,8 +105,9 @@
 #include "ip-lib.h"
 #include "lib.h"
 
-#define	PIDFILE			"/var/run/tcpproxy.pid"
-#define	ERROR_LOG		"/tmp/tcpproxy-error.log"
+#define CONFFILE		"__PREFIX__/etc/tcpproxy.conf"
+#define	PIDFILE			"__PREFIX__/var/run/tcpproxy.pid"
+#define	ERROR_LOG		"__PREFIX__/var/log/tcpproxy-error.log"
 #define	MAX_PORT		80
 
 
@@ -1212,7 +1213,7 @@
 	if (*configfile != 0)
 		read_configuration(configfile, x);
  	else if (bound == 0  &&  k >= argc) {
-		copy_string(configfile, "/etc/tcpproxy.conf", sizeof(configfile));
+		copy_string(configfile, CONFFILE, sizeof(configfile));
 		standalone = 1;
 
 		read_configuration(configfile, x);
