From 254a485c33c9692f527e33c1423399ce99b1aa2b Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 16 Jun 2010 11:51:43 -0700
Subject: [PATCH] Specify %option prefix="glcpp_" in the source code, not the
 Makefile.

---
 glcpp/Makefile    | 2 +-
 glcpp/glcpp-lex.l | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/glcpp/Makefile b/glcpp/Makefile
index 3fb44ac3b2e..1578a8ee308 100644
--- a/glcpp/Makefile
+++ b/glcpp/Makefile
@@ -13,7 +13,7 @@ glcpp: glcpp.o glcpp-lex.o glcpp-parse.o hash_table.o xtalloc.o
 	bison --debug --defines=$*.h --output=$*.c $^
 
 %.c: %.l
-	flex --prefix=glcpp_ --outfile=$@ $<
+	flex --outfile=$@ $<
 
 glcpp-lex.c: glcpp-parse.h
 
diff --git a/glcpp/glcpp-lex.l b/glcpp/glcpp-lex.l
index 0d9a75415a3..cc5f28f8f86 100644
--- a/glcpp/glcpp-lex.l
+++ b/glcpp/glcpp-lex.l
@@ -31,6 +31,7 @@
 
 %option reentrant noyywrap
 %option extra-type="glcpp_parser_t *"
+%option prefix="glcpp_"
 
 SPACE		[[:space:]]
 NONSPACE	[^[:space:]]
-- 
2.30.2