diff -p1 -u xrootconsole-0.5.orig/Makefile xrootconsole-0.5/Makefile
--- xrootconsole-0.5.orig/Makefile	2001-12-19 04:48:51.000000000 -0500
+++ xrootconsole-0.5/Makefile	2002-09-07 20:54:42.000000000 -0400
@@ -35,3 +35,5 @@
 EXEC = xrootconsole
-BINDIR = /usr/local/bin
+MANFILE = xrootconsole.1
+BINDIR = $(prefix)/bin
+MANDIR = $(prefix)/share/man/man1
 
@@ -43,3 +45,3 @@ VERSION = $(shell tag=$$(echo '$$Name: R
 
-CC = gcc
+CC = cc
 CPPFLAGS =
@@ -47,4 +49,5 @@ CPPFLAGS =
 # for production
-CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\""
-LDFLAGS = -s
+CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
+	-I/usr/X11R6/include
+LDFLAGS = 
 
@@ -54,3 +57,3 @@ LDFLAGS = -s
 
-LIBS = -L/usr/X11R6/lib -lX11 -lutil
+LIBS = -L/usr/X11R6/lib -lX11
 
@@ -74,2 +77,7 @@ realclean:
 install: $(EXEC)
-	cp $(EXEC) $(BINDIR)
+	install -d $(BINDIR)
+	install -c $(EXEC) $(BINDIR)/$(EXEC)
+	install -d $(MANDIR)
+	install -c $(MANFILE) $(MANDIR)/$(MANFILE)
+
+uninstall:
+	rm -f $(BINDIR)/$(EXEC)
+	rm -f $(MANDIR)/$(MANFILE)
diff -p1 -u xrootconsole-0.5.orig/main.c xrootconsole-0.5/main.c
--- xrootconsole-0.5.orig/main.c	2002-07-01 02:24:02.000000000 -0400
+++ xrootconsole-0.5/main.c	2002-09-07 20:53:40.000000000 -0400
@@ -42,2 +42,3 @@
 #include <X11/Xutil.h>
+#include <X11/Xos.h>
 #include <assert.h>