--- ircii-20051015.orig/Makefile.in
+++ ircii-20051015/Makefile.in
@@ -66,6 +66,7 @@
 VPATH = @srcdir@/source
 objdir = @objdir@
 bindir = $(DESTDIR)@bindir@
+sbindir= $(DESTDIR)@sbindir@
 datadir = $(DESTDIR)@datadir@
 libdir = $(DESTDIR)@libdir@
 mandir = $(DESTDIR)@mandir@/man1
@@ -114,16 +115,16 @@
 
 # Set the next line to the full path for installation of the ircio program
 # if you wish to use it. 
-INSTALL_IRCIO = $(bindir)/ircio
+INSTALL_IRCIO = $(sbindir)/ircio
 
 # This little program is necessary to have an interactive shell
 # in a window of ircII. The 'shell' script uses it, so also update
 # the path in there, if you want to enable this.
-INSTALL_IRCFLUSH = $(bindir)/ircflush
+INSTALL_IRCFLUSH = $(sbindir)/ircflush
 
 # This program allows you to use screen/xterm's to put new irc windows
 # on new screen/xterm windows.
-INSTALL_WSERV = $(bindir)/wserv
+INSTALL_WSERV = $(sbindir)/wserv
 
 # This command will be used to install the irc help files.  If you don't
 # want to install them, replace with the following:
@@ -294,7 +295,7 @@
 IRCFLUSH_SOURCES = ircflush.c
 IRCFLUSH_OBJECTS = ircflush.o ircsig.o
 
-INCLUDES = -I. -I$(incdir) -I$(srcdir)/rijndael
+INCLUDES = -iquote . -iquote $(incdir) -iquote $(srcdir)/rijndael
 
 .c.o:
 	$(CC) $(INCLUDES) $(CFLAGS) $(DEFS) -c $<
@@ -322,13 +323,13 @@
 # auxiliary programs
 
 ircflush: $(IRCFLUSH_OBJECTS)
-	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o $@ $(IRCFLUSH_OBJECTS) $(LIBS)
+	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o $@ $(IRCFLUSH_OBJECTS)
 
 ircio: $(IRCIO_OBJECTS)
-	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) $(PPS_DEFS) -o $@ $(IRCIO_OBJECTS) $(LIBS)
+	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) $(PPS_DEFS) -o $@ $(IRCIO_OBJECTS)
 
 wserv: $(WSERV_OBJECTS)
-	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o $@ $(WSERV_OBJECTS) $(LIBS)
+	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o $@ $(WSERV_OBJECTS)
 
 # use this to generate something to include below.
 makedepend: $(SOURCES) $(IRCIO_SOURCES) $(WSERV_SOURCES) $(IRCFLUSH_SOURCES)