diff --git a/src/Makefile b/src/Makefile index a810fe3c..dc5aa12f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,8 @@ -# @(#$Id: Makefile,v 1.20 2005-12-05 14:57:54 dockes Exp $ (C) 2005 J.F.Dockes +# @(#$Id: Makefile,v 1.21 2005-12-06 15:10:36 dockes Exp $ (C) 2005 J.F.Dockes # Default values. These can be overridden on the command line ie: # make prefix=/usr prefix=/usr/local -INSTALL = install -c all: mk/sysconf common/rclversion.h cd lib; ${MAKE} @@ -46,4 +45,4 @@ distclean: clean install: all ./recollinstall ${prefix} -.PHONY: all static clean distclean install installme +.PHONY: all static clean distclean install diff --git a/src/VERSION b/src/VERSION index bb83058e..2ac9634d 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.0.12 +1.0.13 diff --git a/src/recollinstall.in b/src/recollinstall.in index 8f98dd75..e1a3e2c1 100755 --- a/src/recollinstall.in +++ b/src/recollinstall.in @@ -1,7 +1,5 @@ #!/bin/sh - -# Install recoll files. This has 2 modes, for installing the binaries or -# the personal configuration files +# Install recoll files. fatal() { @@ -10,22 +8,20 @@ fatal() } usage() { - echo 'Usage (common files): recollinstall , ie: recollinstall /usr/local' - fatal 'Usage (personal config): recollinstall' + fatal 'Usage: recollinstall , ie: recollinstall /usr/local' } -INSTALL=${INSTALL:=install} +INSTALL=${INSTALL:=install -c} -if test $# = 1 ; then - # Install commands and example config to target directory - PREFIX=$1 +# Install commands and example config to target directory +PREFIX=$1 - echo "Installing to $PREFIX" +echo "Installing to $PREFIX" - test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \ - " You need to build first (type 'make')." +test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \ + " You need to build first (type 'make')." - for d in ${PREFIX} \ +for d in ${PREFIX} \ ${PREFIX}/bin \ ${PREFIX}/share \ ${PREFIX}/share/recoll \ @@ -33,57 +29,19 @@ if test $# = 1 ; then ${PREFIX}/share/recoll/filters \ ${PREFIX}/share/recoll/images \ ${PREFIX}/share/recoll/translations - do - test -d $d || mkdir $d || exit 1 - done +do + test -d $d || mkdir $d || exit 1 +done +${INSTALL} qtgui/recoll index/recollindex $PREFIX/bin || exit 1 - ${INSTALL} qtgui/recoll index/recollindex recollinstall $PREFIX/bin \ - || exit 1 +${INSTALL} filters/rcl* ${PREFIX}/share/recoll/filters/ || exit 1 +chmod a+x ${PREFIX}/share/recoll/filters/rcl* || exit 1 +# Clean up possible old filters in examples +rm -f ${PREFIX}/share/recoll/examples/rcl* - ${INSTALL} filters/rcl* ${PREFIX}/share/recoll/filters/ || exit 1 - chmod a+x ${PREFIX}/share/recoll/filters/rcl* || exit 1 - # Clean up possible old filters in examples - rm -f ${PREFIX}/share/recoll/examples/rcl* - - ${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \ +${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \ ${PREFIX}/share/recoll/examples/ || exit 1 - - ${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1 - ${INSTALL} qtgui/recoll*.qm ${PREFIX}/share/recoll/translations || exit 1 - - exit 0 - -else - - # Install configuration files to home directory - PREFIX=${PREFIX:=@prefix@} - - me=`whoami` - if test "$me" = root ; then - fatal "Can't install personal config in root's home directory" - fi - if test ! -d ${PREFIX}/share/recoll/examples ; then - fatal "Global install should be performed first" - fi - - if test -d $HOME/.recoll ; then - cat <