From a16238932a35c7bd8db52db649651333ea8281fc Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 26 Aug 2013 22:44:22 +0000
Subject: [PATCH] looks like we had a long-term confusion for LFLAGS as a set
 of linker flags and as a set of flex flags.  Renamed LFLAGS to FLEXFLAGS for
 flex input.

---
 dtool/pptempl/Template.gmsvc.pp | 2 +-
 dtool/pptempl/Template.nmake.pp | 2 +-
 dtool/pptempl/Template.unix.pp  | 2 +-
 panda/src/egg/Sources.pp        | 1 +
 pandatool/src/xfile/Sources.pp  | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 85abb99c3b..489b188c07 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -814,7 +814,7 @@ $[TAB] cp $[target_header_prebuilt] $[target_header]
 #if $[HAVE_BISON]
 #define source $[file]
 $[target] : $[file]
-$[TAB] $[FLEX] $[LFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[file]
+$[TAB] $[FLEX] $[FLEXFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[file]
 #define source lex.yy.c
 #define script /#include <unistd.h>/d
 $[TAB] $[SED]
diff --git a/dtool/pptempl/Template.nmake.pp b/dtool/pptempl/Template.nmake.pp
index fe278b54e8..58ede42909 100644
--- a/dtool/pptempl/Template.nmake.pp
+++ b/dtool/pptempl/Template.nmake.pp
@@ -815,7 +815,7 @@ $[TAB] copy /Y $[osfilename $[target_header_prebuilt]] $[osfilename $[target_hea
 #if $[HAVE_BISON]
 #define source $[file]
 $[osfilename $[target]] : $[osfilename $[file]]
-$[TAB] $[FLEX] $[LFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[osfilename $[file]]
+$[TAB] $[FLEX] $[FLEXFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[osfilename $[file]]
 #define source lex.yy.c
 #define script /#include <unistd.h>/d
 $[TAB] $[SED]
diff --git a/dtool/pptempl/Template.unix.pp b/dtool/pptempl/Template.unix.pp
index 9c31f2c6af..e9baf63dba 100644
--- a/dtool/pptempl/Template.unix.pp
+++ b/dtool/pptempl/Template.unix.pp
@@ -615,7 +615,7 @@ $[TAB] cp $[target_header_prebuilt] $[target_header]
 #if $[HAVE_BISON]
 #define source $[file]
 $[target] : $[file]
-$[TAB] $[FLEX] $[LFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[file]
+$[TAB] $[FLEX] $[FLEXFLAGS] $[if $[YACC_PREFIX],-P$[YACC_PREFIX]] -olex.yy.c $[file]
 #define source lex.yy.c
 #define script /#include <unistd.h>/d
 $[TAB] $[SED]
diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp
index fda13e439f..49757317ae 100644
--- a/panda/src/egg/Sources.pp
+++ b/panda/src/egg/Sources.pp
@@ -3,6 +3,7 @@
 #define OTHER_LIBS p3interrogatedb:c p3dconfig:c p3dtoolconfig:m \
                    p3dtoolutil:c p3dtoolbase:c p3dtool:m p3prc:c
 #define YACC_PREFIX eggyy
+#define FLEXFLAGS -i
 #define USE_PACKAGES zlib
 
 #begin lib_target
diff --git a/pandatool/src/xfile/Sources.pp b/pandatool/src/xfile/Sources.pp
index ad9f520325..b04fd10646 100644
--- a/pandatool/src/xfile/Sources.pp
+++ b/pandatool/src/xfile/Sources.pp
@@ -1,4 +1,5 @@
 #define YACC_PREFIX xyy
+#define FLEXFLAGS -i
 
 #define USE_PACKAGES zlib