diff --git a/src/Makefile b/src/Makefile
index e63fd428..844f608f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,10 @@
-# @(#$Id: Makefile,v 1.22 2005-12-16 10:06:56 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.23 2006-01-05 10:24:54 dockes Exp $  (C) 2005 J.F.Dockes
 
 all: mk/sysconf common/rclversion.h
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
-	cd index; rm -f recollindex; ${MAKE} recollindex
-	cd qtgui; qmake recoll.pro; rm -f recoll; \
+	cd index; ${MAKE} recollindex
+	cd qtgui; qmake recoll.pro; \
 	   cat ../mk/sysconf Makefile | \
 	       ${MAKE} -f -
 
@@ -39,6 +39,6 @@ distclean: clean
 	rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf recollinstall
 
 install: all
-	./recollinstall
+	bindir=${bindir} datadir=${datadir} ./recollinstall ${prefix}
 
 .PHONY: all static clean distclean install
diff --git a/src/recollinstall.in b/src/recollinstall.in
index 8df25a5c..f83ca530 100755
--- a/src/recollinstall.in
+++ b/src/recollinstall.in
@@ -8,7 +8,7 @@ fatal()
 }
 usage()
 {
-    fatal 'Usage: recollinstall [<dir>], ie: recollinstall /usr/local'
+    fatal 'Usage: recollinstall [<prefixdir>], ie: recollinstall /usr/local'
 }
 
 if test $# -eq 0 ; then
@@ -20,6 +20,8 @@ else
 fi
 
 echo "Installing to $PREFIX"
+test -n "$bindir" || bindir=$PREFIX/bin
+test -n "$datadir" || datadir=$PREFIX/share
 
 INSTALL=${INSTALL:=install -c}
 STRIP=${STRIP:=strip}
@@ -27,17 +29,14 @@ STRIP=${STRIP:=strip}
 test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
      " You need to build first (type 'make')."
 
-for d in ${PREFIX} \
-	    ${PREFIX}/bin \
-	    ${PREFIX}/share \
-	    ${PREFIX}/share/recoll \
-	    ${PREFIX}/share/recoll/doc \
-	    ${PREFIX}/share/recoll/examples \
-	    ${PREFIX}/share/recoll/filters \
-	    ${PREFIX}/share/recoll/images \
-	    ${PREFIX}/share/recoll/translations
+for d in \
+    ${bindir} \
+    ${datadir}/recoll/examples \
+    ${datadir}/recoll/filters \
+    ${datadir}/recoll/images \
+    ${datadir}/recoll/translations
 do
-  test -d $d || mkdir $d || exit 1
+    test -d $d || mkdir -p $d || exit 1
 done
 
 ${INSTALL} doc/usermanual.html doc/docbook.css ${PREFIX}/share/recoll/doc