mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Fixing previous mess with git stash (apologies).
This commit is contained in:
parent
a2291edac6
commit
36b6296791
@ -21,15 +21,13 @@ if [ "$(which wmctrl)" == "" ]; then
|
||||
exit -1;
|
||||
fi
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
if [ "$(which pcregrep)" == "" ]; then
|
||||
echo "You need to install pcregrep first, try:"
|
||||
echo " sudo apt-get install pcregrep"
|
||||
exit -1;
|
||||
fi
|
||||
=======
|
||||
|
||||
PROGRAM_SUFFIX=$(grep -e '#define PACKAGE ' ../../config.h | sed -e 's/#define PACKAGE "lyx\(.*\)"/\1/')
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
export XVKBD_EXE=../$XVKBD_EXE
|
||||
export KEYTEST=../keytest.py
|
||||
|
Loading…
Reference in New Issue
Block a user