tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install tweaks for rpm compatibility

Browse Source
This commit is contained in:
dockes 2006-01-05 10:24:54 +00:00
parent 1aff860984
commit 78cd0868ed
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -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 all: mk/sysconf common/rclversion.h
cd lib; ${MAKE} cd lib; ${MAKE}
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; rm -f recollindex; ${MAKE} recollindex cd index; ${MAKE} recollindex
cd qtgui; qmake recoll.pro; rm -f recoll; \ cd qtgui; qmake recoll.pro; \
cat ../mk/sysconf Makefile | \ cat ../mk/sysconf Makefile | \
${MAKE} -f - ${MAKE} -f -
@ -39,6 +39,6 @@ distclean: clean
rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf recollinstall rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf recollinstall
install: all install: all
./recollinstall bindir=${bindir} datadir=${datadir} ./recollinstall ${prefix}
.PHONY: all static clean distclean install .PHONY: all static clean distclean install

21
src/recollinstall.in
View File

@ -8,7 +8,7 @@ fatal()
} }
usage() usage()
{ {
fatal 'Usage: recollinstall [<dir>], ie: recollinstall /usr/local' fatal 'Usage: recollinstall [<prefixdir>], ie: recollinstall /usr/local'
} }
if test $# -eq 0 ; then if test $# -eq 0 ; then
@ -20,6 +20,8 @@ else
fi fi
echo "Installing to $PREFIX" echo "Installing to $PREFIX"
test -n "$bindir" || bindir=$PREFIX/bin
test -n "$datadir" || datadir=$PREFIX/share
INSTALL=${INSTALL:=install -c} INSTALL=${INSTALL:=install -c}
STRIP=${STRIP:=strip} STRIP=${STRIP:=strip}
@ -27,17 +29,14 @@ STRIP=${STRIP:=strip}
test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \ test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
" You need to build first (type 'make')." " You need to build first (type 'make')."
for d in ${PREFIX} \ for d in \
${PREFIX}/bin \ ${bindir} \
${PREFIX}/share \ ${datadir}/recoll/examples \
${PREFIX}/share/recoll \ ${datadir}/recoll/filters \
${PREFIX}/share/recoll/doc \ ${datadir}/recoll/images \
${PREFIX}/share/recoll/examples \ ${datadir}/recoll/translations
${PREFIX}/share/recoll/filters \
${PREFIX}/share/recoll/images \
${PREFIX}/share/recoll/translations
do do
test -d $d || mkdir $d || exit 1 test -d $d || mkdir -p $d || exit 1
done done
${INSTALL} doc/usermanual.html doc/docbook.css ${PREFIX}/share/recoll/doc ${INSTALL} doc/usermanual.html doc/docbook.css ${PREFIX}/share/recoll/doc