Open Source Projects Europe

--- a/src/Makefile
+++ b/src/Makefile.in
@@ -1,14 +1,21 @@
-# @(#$Id: Makefile,v 1.26 2006-01-19 12:01:42 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile.in,v 1.1 2006-01-19 17:11:45 dockes Exp $  (C) 2005 J.F.Dockes
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+datadir = @datadir@
+mandir = @mandir@
 
 all: mk/sysconf common/rclversion.h
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
 	cd index; ${MAKE} recollindex
 	cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \
-	 cat ../mk/sysconf Makefile | ${MAKE} -f - depth=..
+	 cat ../mk/sysconf Makefile | ${MAKE} -f - depth=.. 
 
 mk/sysconf:
-	./configure
+	@echo "You need to run configure first" ; exit 1
 
 common/rclversion.h: VERSION
 	echo 'static const char *rclversion = "'`cat VERSION`'";' \
@@ -22,7 +29,8 @@
 	cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \
 	   rm -f recoll;
 	cat ../mk/sysconf Makefile | \
-	   ${MAKE} -f - BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=..
+	   ${MAKE} -f - \
+	     BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=.. 
 
 clean:
 	cd common; ${MAKE} clean
@@ -39,9 +47,14 @@
 	rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
 	   recollinstall \
 	   doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest
-	
 
+# recollinstall can be executed by the user and will compute 'normal'
+# values for bindir etc., relative to the prefix argument.  When executed
+# here, we pass a bunch of variables in the environment, the values will
+# override the computed defaults.
 install: all
-	bindir=${bindir} datadir=${datadir} ./recollinstall ${prefix}
+	DESTDIR=${DESTDIR} bindir=${bindir} datadir=${datadir} \
+	mandir=${mandir} \
+	./recollinstall ${prefix}
 
 .PHONY: all static clean distclean install