summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-02-07 12:42:13 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-02-07 12:42:13 (GMT)
commit42a18510a3dbfb097a6b3846dcc827c9e902ecf3 (patch)
treeb4627985c6d308f1f0b22b22f9faa3e7fcbe6c82
parent0081a72a6bb0a3f9d4d501abb68a19bd24382c94 (diff)
downloadnsgenbind-42a18510a3dbfb097a6b3846dcc827c9e902ecf3.tar.gz
nsgenbind-42a18510a3dbfb097a6b3846dcc827c9e902ecf3.tar.bz2
Bison after version 3.0 require different api prefix handling
-rw-r--r--src/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 15095de..f6f5055 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,7 +15,9 @@ $(BUILDDIR)/%-lexer.c $(BUILDDIR)/%-lexer.h: src/%-lexer.l
$(BUILDDIR)/%-lexer.c: $(BUILDDIR)/%-parser.h
-# Bison 2.6 and later require api.prefix, but this breaks Bison 2.5 and earlier.
+# Bison 3.0 and later require api.prefix in curly braces
+# Bison 2.6 and later require api.prefix
+# Bison 2.5 and earlier require name-prefix switch
bisonvsn := $(word 4,$(shell $(BISON) --version))
bisonmaj := $(word 1,$(subst ., ,$(bisonvsn)))
bisonmin := $(word 2,$(subst ., ,$(bisonvsn)))
@@ -29,7 +31,7 @@ else
BISON_DEFINES = --define=api.prefix=$(*F)_
endif
else
- BISON_DEFINES = --define=api.prefix=$(*F)_
+ BISON_DEFINES = --define=api.prefix={$(*F)_}
endif
endif