Merge remote branch 'upstream/master'

Conflicts:
	openscad.pro

1 files changed, 6 insertions, 1 deletions

diff --git a/flex.pri b/flex.pri
index ef0b742..2e1559e 100644
--- a/flex.pri
+++ b/flex.pri
@@ -11,5 +11,10 @@ win32 {
 
 unix:freebsd-g++ {
   QMAKE_LEX = /usr/local/bin/flex
-  QMAKE_YACC = /usr/local/bin/bison
+}
+
+unix:linux* {
+  exists(/usr/bin/flex) {
+    QMAKE_LEX = /usr/bin/flex
+  }
 }