--- Makefile.orig	2006-04-18 12:18:22.000000000 +0200
+++ Makefile	2006-04-18 12:19:14.000000000 +0200
@@ -19,7 +19,7 @@
 
 objs = network.o posix.o client.o cache.o line.o state.o util.o hooks.o linestack.o plugins.o settings.o isupport.o log.o redirect.o gen_config.o repl.o linestack_file.o ctcp.o motd.o nickserv.o admin.o
 
-ctrlproxy$(EXEEXT): main.o $(objs)
+ctrlproxy$(EXESUFFIX)$(EXEEXT): main.o $(objs)
 	@echo Linking $@
 	@$(CC) $(LIBS) -rdynamic -o $@ $^
 
@@ -43,8 +43,8 @@
 	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
 
 install-bin:
-	$(INSTALL) ctrlproxy$(EXEEXT) $(DESTDIR)$(bindir)
-	$(INSTALL) scripts/upgrade.py $(DESTDIR)$(bindir)/ctrlproxy-upgrade 
+	$(INSTALL) ctrlproxy$(EXESUFFIX)$(EXEEXT) $(DESTDIR)$(bindir)
+	$(INSTALL) scripts/upgrade.py $(DESTDIR)$(bindir)/ctrlproxy$(EXESUFFIX)-upgrade
 
 install-doc: doc
 	$(INSTALL) -m 644 ctrlproxy.h $(DESTDIR)$(destincludedir)
@@ -78,7 +78,7 @@
 
 clean::
 	rm -f $(MODS_SHARED_FILES)
-	rm -f *.$(OBJEXT) ctrlproxy$(EXEEXT) printstats *~
+	rm -f *.$(OBJEXT) ctrlproxy$(EXESUFFIX)$(EXEEXT) printstats *~
 	rm -f *.gcov *.gcno *.gcda mods/*.o
 
 dist: distclean
--- Makefile.settings.in.orig	2006-05-04 02:47:17.000000000 +0200
+++ Makefile.settings.in	2006-05-04 02:49:42.000000000 +0200
@@ -6,14 +6,15 @@
 localedir = @datadir@/locale
 INSTALL = @INSTALL@
 bindir = @bindir@
-docdir = @prefix@/share/doc/ctrlproxy
-modulesdir = @libdir@/ctrlproxy
+docdir = @prefix@/share/doc/ctrlproxy@EXESUFFIX@
+modulesdir = @libdir@/ctrlproxy@EXESUFFIX@
 libdir = @libdir@
 includedir = @includedir@
 mandir = @mandir@
 destincludedir = $(includedir)/ctrlproxy-3.0
-cdatadir = @datadir@/ctrlproxy
+cdatadir = @datadir@/ctrlproxy@EXESUFFIX@
 EXEEXT = @EXEEXT@
+EXESUFFIX = @EXESUFFIX@
 OBJEXT = @OBJEXT@
 CFLAGS = @CFLAGS@ @COMMON_CFLAGS@
 MODS_SHARED = log_irssi auto_away log_custom antiflood repl_simple repl_command repl_highlight repl_lastdisconnect \
--- configure.ac.orig	2006-04-18 12:24:30.000000000 +0200
+++ configure.ac	2006-04-18 12:25:23.000000000 +0200
@@ -9,15 +9,19 @@
 AC_MSG_CHECKING([whether this is a bzr checkout])
 if ! which bzr >/dev/null 2>/dev/null; then
 	AC_MSG_RESULT(no)
+	EXESUFFIX=""
 else 
 	REVISION="`bzr revno .`"
 	if test -n "$REVISION"; then
 		AC_MSG_RESULT($REVISION)
 		BZRVERSION="-bzr-r$REVISION"
+		EXESUFFIX="-bzr"
 	else
 		AC_MSG_RESULT(no)
+		EXESUFFIX=""
 	fi
 fi
+AC_SUBST([EXESUFFIX], [$EXESUFFIX])dnl
 
 AC_DEFINE_UNQUOTED(VERSION,"$VERSION$BZRVERSION", [ Package version])
 AC_SUBST(PACKAGE)
@@ -103,7 +107,7 @@
 
 AC_SUBST(EXTRA_INSTALL_TARGETS)
 
-BINS="ctrlproxy$ac_cv_exeext"
+BINS="ctrlproxy$EXESUFFIX$ac_cv_exeext"
 AC_SUBST(BINS)
 AC_SUBST(MODS_SHARED)