Merge branch 'master' into next

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index 9bf427e0e63f3854709149244794be1bd6ae5521..4394bc41958b7436341fabf212b62affdfbaba76 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,6 +2,8 @@ UNAME=$(shell uname)
 DEBUG=1
 COVERAGE=0
 INSTALL=install
+FLEX=flex
+BISON=bison
 ifndef PREFIX
   PREFIX=/usr
 endif
@@ -60,7 +62,6 @@ CFLAGS += $(call cflags_for_lib, libpcre)
 CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
 CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
 CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
 
 ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
 CPPFLAGS += -DPCRE_HAS_UCP=1