anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing previous mess with git stash (apologies).

Browse Source
This commit is contained in:
Tommaso Cucinotta 2013-11-13 20:07:53 +00:00
parent a2291edac6
commit 36b6296791
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/autotests/run-tests.sh
View File

@ -21,15 +21,13 @@ 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/') 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