no recollinstall install

This commit is contained in:
dockes 2005-12-06 15:10:36 +00:00
parent c445744403
commit e062f43a55
3 changed files with 23 additions and 66 deletions

View File

@ -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: # Default values. These can be overridden on the command line ie:
# make prefix=/usr # make prefix=/usr
prefix=/usr/local prefix=/usr/local
INSTALL = install -c
all: mk/sysconf common/rclversion.h all: mk/sysconf common/rclversion.h
cd lib; ${MAKE} cd lib; ${MAKE}
@ -46,4 +45,4 @@ distclean: clean
install: all install: all
./recollinstall ${prefix} ./recollinstall ${prefix}
.PHONY: all static clean distclean install installme .PHONY: all static clean distclean install

View File

@ -1 +1 @@
1.0.12 1.0.13

View File

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
# Install recoll files.
# Install recoll files. This has 2 modes, for installing the binaries or
# the personal configuration files
fatal() fatal()
{ {
@ -10,13 +8,11 @@ fatal()
} }
usage() usage()
{ {
echo 'Usage (common files): recollinstall <dir>, ie: recollinstall /usr/local' fatal 'Usage: recollinstall <dir>, ie: recollinstall /usr/local'
fatal 'Usage (personal config): recollinstall'
} }
INSTALL=${INSTALL:=install} INSTALL=${INSTALL:=install -c}
if test $# = 1 ; then
# Install commands and example config to target directory # Install commands and example config to target directory
PREFIX=$1 PREFIX=$1
@ -37,9 +33,7 @@ if test $# = 1 ; then
test -d $d || mkdir $d || exit 1 test -d $d || mkdir $d || exit 1
done 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 ${INSTALL} filters/rcl* ${PREFIX}/share/recoll/filters/ || exit 1
chmod a+x ${PREFIX}/share/recoll/filters/rcl* || exit 1 chmod a+x ${PREFIX}/share/recoll/filters/rcl* || exit 1
@ -49,41 +43,5 @@ if test $# = 1 ; then
${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \ ${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \
${PREFIX}/share/recoll/examples/ || exit 1 ${PREFIX}/share/recoll/examples/ || exit 1
${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1 ${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1
${INSTALL} qtgui/recoll*.qm ${PREFIX}/share/recoll/translations || 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 <<EOF
$HOME/.recoll already exists, no modification done.
You should check for new filters or updated files in
${PREFIX}/share/recoll/examples.
EOF
exit 0
fi
mkdir $HOME/.recoll || exit 1
cp ${PREFIX}/share/recoll/examples/* $HOME/.recoll
chmod +w $HOME/.recoll/recoll.conf
chmod +w $HOME/.recoll/mimeconf
echo Copied configuration files and filters to $HOME/.recoll/
echo You should now take a look at $HOME/.recoll/recoll.conf
exit 0
fi