Now run-tests.sh captures PROGRAM_SUFFIX from config.h, in order to use the correct .lyx folder name.

This commit is contained in:
Tommaso Cucinotta 2013-11-13 02:41:38 +00:00
parent 777156e0ff
commit a2291edac6

View File

@ -21,16 +21,20 @@ if [ "$(which wmctrl)" == "" ]; then
exit -1; exit -1;
fi fi
<<<<<<< Updated upstream
if [ "$(which pcregrep)" == "" ]; then if [ "$(which pcregrep)" == "" ]; then
echo "You need to install pcregrep first, try:" echo "You need to install pcregrep first, try:"
echo " sudo apt-get install pcregrep" echo " sudo apt-get install pcregrep"
exit -1; exit -1;
fi fi
=======
PROGRAM_SUFFIX=$(grep -e '#define PACKAGE ' ../../config.h | sed -e 's/#define PACKAGE "lyx\(.*\)"/\1/')
>>>>>>> Stashed changes
export XVKBD_EXE=../$XVKBD_EXE export XVKBD_EXE=../$XVKBD_EXE
export KEYTEST=../keytest.py export KEYTEST=../keytest.py
LYX_HOME=out-home LYX_HOME=out-home
export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx export LYX_USERDIR=$(pwd)/$LYX_HOME/.lyx$PROGRAM_SUFFIX
# Create locale links # Create locale links
export LOCALE_DIR=../locale export LOCALE_DIR=../locale