From e1a8793ea19f189a761333a43191fc5a6e19cf1c Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Fri, 5 Oct 2018 19:03:34 +0000 Subject: [PATCH] Merge branch 'fix-bison' into 'master' parser: fix Makefile hardcoded paths to flex and bison Closes #4 See merge request apparmor/apparmor!224 Acked-by: Christian Boltz for 2.10..master (cherry picked from commit 34cf08503613a60298281200db9218a7532a1e31) 17e059a2 parser: fix Makefile hardcoded paths to flex and bison --- parser/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/Makefile b/parser/Makefile index 4d370c367..015c218d9 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -27,9 +27,9 @@ INSTALL_CONFDIR=${DESTDIR}${CONFDIR} LOCALEDIR=/usr/share/locale MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 -YACC := /usr/bin/bison +YACC := bison YFLAGS := -d -LEX := /usr/bin/flex +LEX := flex LEXFLAGS = -B -v WARNINGS = -Wall EXTRA_WARNINGS = -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter