Index: GNUmakefile
--- GNUmakefile.orig	2006-11-16 17:08:15 +0100
+++ GNUmakefile	2007-01-27 21:30:04 +0100
@@ -113,9 +113,9 @@
 	$(INSTALL) darcs $(DESTDIR)$(bindir)
 	$(REZ_CMD) $(REZ_FLAGS) -o $(DESTDIR)$(bindir)/darcs 
 
-	test -d $(DESTDIR)$(sysconfdir)/bash_completion.d || \
-		$(INSTALL) -d $(DESTDIR)$(sysconfdir)/bash_completion.d
-	$(INSTALL_DATA) darcs_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/darcs
+	test -d $(DESTDIR)$(sysconfdir)/darcs || \
+		$(INSTALL) -d $(DESTDIR)$(sysconfdir)/darcs
+	$(INSTALL_DATA) darcs_completion $(DESTDIR)$(sysconfdir)/darcs/darcs.bashrc
 
 	test -d $(DESTDIR)$(mandir)/man1 || \
 		$(INSTALL) -d $(DESTDIR)$(mandir)/man1
@@ -132,14 +132,14 @@
 	$(INSTALL_DATA) zsh_completion_old $(DESTDIR)$(datadir)/doc/darcs/examples/
 
 installserver:	cgi/darcs.cgi
-	test -d $(DESTDIR)$(libexecdir)/cgi-bin || \
-		$(INSTALL) -d $(DESTDIR)$(libexecdir)/cgi-bin
+	test -d $(DESTDIR)$(prefix)/cgi || \
+		$(INSTALL) -d $(DESTDIR)$(prefix)/cgi
 
 	test -d $(DESTDIR)$(sysconfdir)/darcs || \
 		$(INSTALL) -d $(DESTDIR)$(sysconfdir)/darcs
 	test -e $(DESTDIR)$(sysconfdir)/darcs/cgi.conf || \
 	    $(INSTALL_DATA) cgi/cgi.conf $(DESTDIR)$(sysconfdir)/darcs/cgi.conf
-	$(INSTALL) cgi/darcs.cgi $(DESTDIR)$(libexecdir)/cgi-bin/darcs.cgi
+	$(INSTALL) cgi/darcs.cgi $(DESTDIR)$(prefix)/cgi/darcs.cgi
 	test -d $(DESTDIR)$(datadir)/darcs || \
 		$(INSTALL) -d $(DESTDIR)$(datadir)/darcs
 	test -d $(DESTDIR)$(datadir)/darcs/xslt || \