configure.in    |  2 +-

 src/Makefile.in | 16 ++++++++--------

 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in

index 6d10ece..e64aac2 100644

--- a/configure.in

+++ b/configure.in

@@ -63,7 +63,7 @@ AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")

 if test "$use_debug" = "yes"; then

 	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"

 else

-	CFLAGS="${CFLAGS} -O3"

+	CFLAGS="${CFLAGS:--O3}"

 fi

 # Choosing the target

diff --git a/src/Makefile.in b/src/Makefile.in

index dad35a1..a61818d 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -16,21 +16,21 @@ shared: libircclient.so

 shared_mingw: libircclient.dll

 install:

-	-mkdir -p $(DESTDIR)@prefix@/include

+	-mkdir -p $(DESTDIR)@includedir@/libircclient

 	-mkdir -p $(DESTDIR)@libdir@

-	cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h

-	cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h

-	cp ../include/libirc_events.h  $(DESTDIR)@prefix@/include/libirc_events.h 

-	cp ../include/libirc_options.h  $(DESTDIR)@prefix@/include/libirc_options.h 

-	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h 

+	cp ../include/libircclient.h $(DESTDIR)@includedir@/libircclient/libircclient.h

+	cp ../include/libirc_errors.h $(DESTDIR)@includedir@/libircclient/libirc_errors.h

+	cp ../include/libirc_events.h  $(DESTDIR)@includedir@/libircclient/libirc_events.h

+	cp ../include/libirc_options.h  $(DESTDIR)@includedir@/libircclient/libirc_options.h

+	cp ../include/libirc_rfcnumeric.h  $(DESTDIR)@includedir@/libircclient/libirc_rfcnumeric.h

 	cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)

 	ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so

 libircclient.so: libircclient.o

-	$(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@

+	$(CC) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LDFLAGS@ @LIBS@

 libircclient.dll: libircclient.o

-	$(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@

+	$(CC) -shared -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@

 libircclient.a: libircclient.o

 	$(AR) libircclient.a libircclient.o