From df7724b083f48023546425e758d78cc9b2dee57c Mon Sep 17 00:00:00 2001 From: dockes Date: Wed, 21 Oct 2009 07:24:22 +0000 Subject: [PATCH] get makestaticdist to work with qt4 --- src/makestaticdist.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/makestaticdist.sh b/src/makestaticdist.sh index c17d3a76..97f1a0ca 100644 --- a/src/makestaticdist.sh +++ b/src/makestaticdist.sh @@ -2,6 +2,11 @@ #set -x # A shell-script to make a recoll static binary distribution: +fatal() +{ + echo $*;exit 1 +} + TAR=tar targetdir=${targetdir-/tmp} @@ -15,6 +20,14 @@ version=`cat VERSION` sys=`uname -s` sysrel=`uname -r` +qtguiassign=`egrep '^QTGUI=' recollinstall` +stripassign=`egrep '^STRIP=' recollinstall` +test ! -z "$qtguiassign" || fatal "Can't find qt version" +test ! -z "$stripassign" || fatal "Can't find strip string" +eval $qtguiassign +eval $stripassign +echo "QTGUI: " $QTGUI "STRIP: " $STRIP + topdirsimple=recoll-${version}-${sys}-${sysrel} topdir=$targetdir/$topdirsimple @@ -30,14 +43,15 @@ else fi fi +rm -f index/recollindex ${QTGUI}/recoll -rm -f index/recollindex qtgui/recoll make static || exit 1 -strip index/recollindex qtgui/recoll + +${STRIP} index/recollindex ${QTGUI}/recoll files="COPYING README INSTALL VERSION Makefile recollinstall filters desktop sampleconf doc/user doc/man -index/recollindex index/rclmon.sh qtgui/recoll qtgui/i18n/*.qm +index/recollindex index/rclmon.sh ${QTGUI}/recoll qtgui/i18n/*.qm qtgui/mtpics/*.png desktop/recoll.png desktop/recoll-searchgui.desktop"