Sync contrib/tools/bison layout with upstream

59379f119eb5f2fd036edea64923ff53b96c9028

105 files changed, 7 insertions, 7 deletions

diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf
index 4fbce40991..96d3ff5ed8 100644
--- a/build/conf/bison_lex.conf
+++ b/build/conf/bison_lex.conf
@@ -6,7 +6,7 @@
 LEX_FLAGS=
 BISON_FLAGS=-v
 
-_BISON_DATA_DIR=contrib/tools/bison/bison/data
+_BISON_DATA_DIR=contrib/tools/bison/data
 _CPP_BISON_SKELS=\
   ${_BISON_DATA_DIR}/bison.m4 \
   ${_BISON_DATA_DIR}/c++-skel.m4 \
@@ -132,13 +132,13 @@ macro USE_OLD_FLEX() {
 }
 
 macro _SRC("y", SRC, SRCFLAGS...) {
-    .PEERDIR=contrib/tools/bison/bison/induced
-    .CMD=${tool:"contrib/tools/bison/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
+    .PEERDIR=contrib/tools/bison/induced
+    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
     .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
 }
 
 macro _SRC("ypp", SRC, SRCFLAGS...) {
-    .PEERDIR=contrib/tools/bison/bison/induced
+    .PEERDIR=contrib/tools/bison/induced
     .CMD=$_SRC(y $SRC $SRCFLAGS)
     .SEM=$_SRC(y $SRC $SRCFLAGS)
 }
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index 66261fdcca..e4143a0564 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -504,7 +504,7 @@
         - contrib/libs/glibcasm/glibc/include/stdint.h
         - contrib/libs/cxxsupp/libcxx/include/stdint.h
 
-- source_filter: "^contrib/tools/bison/bison/data"
+- source_filter: "^contrib/tools/bison/data"
   includes:
     - position.hh
 
diff --git a/contrib/tools/bison/bison/AUTHORS b/contrib/tools/bison/AUTHORS
index fa4b1715a5..fa4b1715a5 100644
--- a/contrib/tools/bison/bison/AUTHORS
+++ b/contrib/tools/bison/AUTHORS
diff --git a/contrib/tools/bison/bison/COPYING b/contrib/tools/bison/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/contrib/tools/bison/bison/COPYING
+++ b/contrib/tools/bison/COPYING
diff --git a/contrib/tools/bison/bison/ChangeLog-1998 b/contrib/tools/bison/ChangeLog-1998
index f34e2a3734..f34e2a3734 100644
--- a/contrib/tools/bison/bison/ChangeLog-1998
+++ b/contrib/tools/bison/ChangeLog-1998
diff --git a/contrib/tools/bison/bison/ChangeLog-2012 b/contrib/tools/bison/ChangeLog-2012
index 458a9e55e2..458a9e55e2 100644
--- a/contrib/tools/bison/bison/ChangeLog-2012
+++ b/contrib/tools/bison/ChangeLog-2012
diff --git a/contrib/tools/bison/bison/NEWS b/contrib/tools/bison/NEWS
index 991a308bec..991a308bec 100644
--- a/contrib/tools/bison/bison/NEWS
+++ b/contrib/tools/bison/NEWS
diff --git a/contrib/tools/bison/bison/README b/contrib/tools/bison/README
index ed393c2856..ed393c2856 100644
--- a/contrib/tools/bison/bison/README
+++ b/contrib/tools/bison/README
diff --git a/contrib/tools/bison/bison/README-alpha b/contrib/tools/bison/README-alpha
index cf065eed34..cf065eed34 100644
--- a/contrib/tools/bison/bison/README-alpha
+++ b/contrib/tools/bison/README-alpha
diff --git a/contrib/tools/bison/bison/README-hacking b/contrib/tools/bison/README-hacking
index 28870cb268..28870cb268 100644
--- a/contrib/tools/bison/bison/README-hacking
+++ b/contrib/tools/bison/README-hacking
diff --git a/contrib/tools/bison/bison/arcadia_root.cpp.in b/contrib/tools/bison/arcadia_root.cpp.in
index f4e9dd9429..f4e9dd9429 100644
--- a/contrib/tools/bison/bison/arcadia_root.cpp.in
+++ b/contrib/tools/bison/arcadia_root.cpp.in
diff --git a/contrib/tools/bison/bison/arcadia_root.h b/contrib/tools/bison/arcadia_root.h
index 9c89539def..9c89539def 100644
--- a/contrib/tools/bison/bison/arcadia_root.h
+++ b/contrib/tools/bison/arcadia_root.h
diff --git a/contrib/tools/bison/bison/data/README b/contrib/tools/bison/data/README
index 842c004186..842c004186 100644
--- a/contrib/tools/bison/bison/data/README
+++ b/contrib/tools/bison/data/README
diff --git a/contrib/tools/bison/bison/data/bison.m4 b/contrib/tools/bison/data/bison.m4
index ca27159c87..ca27159c87 100644
--- a/contrib/tools/bison/bison/data/bison.m4
+++ b/contrib/tools/bison/data/bison.m4
diff --git a/contrib/tools/bison/bison/data/c++-skel.m4 b/contrib/tools/bison/data/c++-skel.m4
index 06597a8bff..06597a8bff 100644
--- a/contrib/tools/bison/bison/data/c++-skel.m4
+++ b/contrib/tools/bison/data/c++-skel.m4
diff --git a/contrib/tools/bison/bison/data/c++.m4 b/contrib/tools/bison/data/c++.m4
index be12c0a2fe..be12c0a2fe 100644
--- a/contrib/tools/bison/bison/data/c++.m4
+++ b/contrib/tools/bison/data/c++.m4
diff --git a/contrib/tools/bison/bison/data/c-like.m4 b/contrib/tools/bison/data/c-like.m4
index eb06de2a4d..eb06de2a4d 100644
--- a/contrib/tools/bison/bison/data/c-like.m4
+++ b/contrib/tools/bison/data/c-like.m4
diff --git a/contrib/tools/bison/bison/data/c-skel.m4 b/contrib/tools/bison/data/c-skel.m4
index 36904aaf7b..36904aaf7b 100644
--- a/contrib/tools/bison/bison/data/c-skel.m4
+++ b/contrib/tools/bison/data/c-skel.m4
diff --git a/contrib/tools/bison/bison/data/c.m4 b/contrib/tools/bison/data/c.m4
index b1b4394871..b1b4394871 100644
--- a/contrib/tools/bison/bison/data/c.m4
+++ b/contrib/tools/bison/data/c.m4
diff --git a/contrib/tools/bison/bison/data/glr.cc b/contrib/tools/bison/data/glr.cc
index e57308bd82..e57308bd82 100644
--- a/contrib/tools/bison/bison/data/glr.cc
+++ b/contrib/tools/bison/data/glr.cc
diff --git a/contrib/tools/bison/bison/data/lalr1.cc b/contrib/tools/bison/data/lalr1.cc
index 7ff15234bd..7ff15234bd 100644
--- a/contrib/tools/bison/bison/data/lalr1.cc
+++ b/contrib/tools/bison/data/lalr1.cc
diff --git a/contrib/tools/bison/bison/data/location.cc b/contrib/tools/bison/data/location.cc
index 9a60f2503f..9a60f2503f 100644
--- a/contrib/tools/bison/bison/data/location.cc
+++ b/contrib/tools/bison/data/location.cc
diff --git a/contrib/tools/bison/bison/data/m4sugar/foreach.m4 b/contrib/tools/bison/data/m4sugar/foreach.m4
index f6a6394472..f6a6394472 100644
--- a/contrib/tools/bison/bison/data/m4sugar/foreach.m4
+++ b/contrib/tools/bison/data/m4sugar/foreach.m4
diff --git a/contrib/tools/bison/bison/data/m4sugar/m4sugar.m4 b/contrib/tools/bison/data/m4sugar/m4sugar.m4
index b732abc789..b732abc789 100644
--- a/contrib/tools/bison/bison/data/m4sugar/m4sugar.m4
+++ b/contrib/tools/bison/data/m4sugar/m4sugar.m4
diff --git a/contrib/tools/bison/bison/data/stack.hh b/contrib/tools/bison/data/stack.hh
index aa64d63d84..aa64d63d84 100644
--- a/contrib/tools/bison/bison/data/stack.hh
+++ b/contrib/tools/bison/data/stack.hh
diff --git a/contrib/tools/bison/bison/data/variant.hh b/contrib/tools/bison/data/variant.hh
index ac4f7a7850..ac4f7a7850 100644
--- a/contrib/tools/bison/bison/data/variant.hh
+++ b/contrib/tools/bison/data/variant.hh
diff --git a/contrib/tools/bison/bison/data/yacc.c b/contrib/tools/bison/data/yacc.c
index 9fa369c8b2..9fa369c8b2 100644
--- a/contrib/tools/bison/bison/data/yacc.c
+++ b/contrib/tools/bison/data/yacc.c
diff --git a/contrib/tools/bison/bison/induced/ya.make b/contrib/tools/bison/induced/ya.make
index a6893e34d6..a6893e34d6 100644
--- a/contrib/tools/bison/bison/induced/ya.make
+++ b/contrib/tools/bison/induced/ya.make
diff --git a/contrib/tools/bison/bison/src/AnnotationList.c b/contrib/tools/bison/src/AnnotationList.c
index b5781766a4..b5781766a4 100644
--- a/contrib/tools/bison/bison/src/AnnotationList.c
+++ b/contrib/tools/bison/src/AnnotationList.c
diff --git a/contrib/tools/bison/bison/src/AnnotationList.h b/contrib/tools/bison/src/AnnotationList.h
index 5abaa2e79b..5abaa2e79b 100644
--- a/contrib/tools/bison/bison/src/AnnotationList.h
+++ b/contrib/tools/bison/src/AnnotationList.h
diff --git a/contrib/tools/bison/bison/src/InadequacyList.c b/contrib/tools/bison/src/InadequacyList.c
index 9510b40d91..9510b40d91 100644
--- a/contrib/tools/bison/bison/src/InadequacyList.c
+++ b/contrib/tools/bison/src/InadequacyList.c
diff --git a/contrib/tools/bison/bison/src/InadequacyList.h b/contrib/tools/bison/src/InadequacyList.h
index d293b9b6c6..d293b9b6c6 100644
--- a/contrib/tools/bison/bison/src/InadequacyList.h
+++ b/contrib/tools/bison/src/InadequacyList.h
diff --git a/contrib/tools/bison/bison/src/LR0.c b/contrib/tools/bison/src/LR0.c
index f6a9537e4c..f6a9537e4c 100644
--- a/contrib/tools/bison/bison/src/LR0.c
+++ b/contrib/tools/bison/src/LR0.c
diff --git a/contrib/tools/bison/bison/src/LR0.h b/contrib/tools/bison/src/LR0.h
index 976bcb26ee..976bcb26ee 100644
--- a/contrib/tools/bison/bison/src/LR0.h
+++ b/contrib/tools/bison/src/LR0.h
diff --git a/contrib/tools/bison/bison/src/Sbitset.c b/contrib/tools/bison/src/Sbitset.c
index bb278b55db..bb278b55db 100644
--- a/contrib/tools/bison/bison/src/Sbitset.c
+++ b/contrib/tools/bison/src/Sbitset.c
diff --git a/contrib/tools/bison/bison/src/Sbitset.h b/contrib/tools/bison/src/Sbitset.h
index bcb329ad39..bcb329ad39 100644
--- a/contrib/tools/bison/bison/src/Sbitset.h
+++ b/contrib/tools/bison/src/Sbitset.h
diff --git a/contrib/tools/bison/bison/src/assoc.c b/contrib/tools/bison/src/assoc.c
index d2eec31574..d2eec31574 100644
--- a/contrib/tools/bison/bison/src/assoc.c
+++ b/contrib/tools/bison/src/assoc.c
diff --git a/contrib/tools/bison/bison/src/assoc.h b/contrib/tools/bison/src/assoc.h
index b9475b5d12..b9475b5d12 100644
--- a/contrib/tools/bison/bison/src/assoc.h
+++ b/contrib/tools/bison/src/assoc.h
diff --git a/contrib/tools/bison/bison/src/closure.c b/contrib/tools/bison/src/closure.c
index 45e8311022..45e8311022 100644
--- a/contrib/tools/bison/bison/src/closure.c
+++ b/contrib/tools/bison/src/closure.c
diff --git a/contrib/tools/bison/bison/src/closure.h b/contrib/tools/bison/src/closure.h
index ad4a3ba96b..ad4a3ba96b 100644
--- a/contrib/tools/bison/bison/src/closure.h
+++ b/contrib/tools/bison/src/closure.h
diff --git a/contrib/tools/bison/bison/src/complain.c b/contrib/tools/bison/src/complain.c
index fdc4b5426b..fdc4b5426b 100644
--- a/contrib/tools/bison/bison/src/complain.c
+++ b/contrib/tools/bison/src/complain.c
diff --git a/contrib/tools/bison/bison/src/complain.h b/contrib/tools/bison/src/complain.h
index 0d81503df7..0d81503df7 100644
--- a/contrib/tools/bison/bison/src/complain.h
+++ b/contrib/tools/bison/src/complain.h
diff --git a/contrib/tools/bison/bison/src/conflicts.c b/contrib/tools/bison/src/conflicts.c
index 1840473620..1840473620 100644
--- a/contrib/tools/bison/bison/src/conflicts.c
+++ b/contrib/tools/bison/src/conflicts.c
diff --git a/contrib/tools/bison/bison/src/conflicts.h b/contrib/tools/bison/src/conflicts.h
index 5df5787162..5df5787162 100644
--- a/contrib/tools/bison/bison/src/conflicts.h
+++ b/contrib/tools/bison/src/conflicts.h
diff --git a/contrib/tools/bison/bison/src/derives.c b/contrib/tools/bison/src/derives.c
index c834f0b0d0..c834f0b0d0 100644
--- a/contrib/tools/bison/bison/src/derives.c
+++ b/contrib/tools/bison/src/derives.c
diff --git a/contrib/tools/bison/bison/src/derives.h b/contrib/tools/bison/src/derives.h
index ea8dff7231..ea8dff7231 100644
--- a/contrib/tools/bison/bison/src/derives.h
+++ b/contrib/tools/bison/src/derives.h
diff --git a/contrib/tools/bison/bison/src/files.c b/contrib/tools/bison/src/files.c
index 3b219229bc..3b219229bc 100644
--- a/contrib/tools/bison/bison/src/files.c
+++ b/contrib/tools/bison/src/files.c
diff --git a/contrib/tools/bison/bison/src/files.h b/contrib/tools/bison/src/files.h
index ebe5037c7a..ebe5037c7a 100644
--- a/contrib/tools/bison/bison/src/files.h
+++ b/contrib/tools/bison/src/files.h
diff --git a/contrib/tools/bison/bison/src/flex-scanner.h b/contrib/tools/bison/src/flex-scanner.h
index 03c9ec64fd..03c9ec64fd 100644
--- a/contrib/tools/bison/bison/src/flex-scanner.h
+++ b/contrib/tools/bison/src/flex-scanner.h
diff --git a/contrib/tools/bison/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c
index d63bc7f9f5..d63bc7f9f5 100644
--- a/contrib/tools/bison/bison/src/getargs.c
+++ b/contrib/tools/bison/src/getargs.c
diff --git a/contrib/tools/bison/bison/src/getargs.h b/contrib/tools/bison/src/getargs.h
index 178fb94377..178fb94377 100644
--- a/contrib/tools/bison/bison/src/getargs.h
+++ b/contrib/tools/bison/src/getargs.h
diff --git a/contrib/tools/bison/bison/src/gram.c b/contrib/tools/bison/src/gram.c
index f6cc3c5d87..f6cc3c5d87 100644
--- a/contrib/tools/bison/bison/src/gram.c
+++ b/contrib/tools/bison/src/gram.c
diff --git a/contrib/tools/bison/bison/src/gram.h b/contrib/tools/bison/src/gram.h
index c1dd9a648a..c1dd9a648a 100644
--- a/contrib/tools/bison/bison/src/gram.h
+++ b/contrib/tools/bison/src/gram.h
diff --git a/contrib/tools/bison/bison/src/graphviz.c b/contrib/tools/bison/src/graphviz.c
index 5ee41e73f3..5ee41e73f3 100644
--- a/contrib/tools/bison/bison/src/graphviz.c
+++ b/contrib/tools/bison/src/graphviz.c
diff --git a/contrib/tools/bison/bison/src/graphviz.h b/contrib/tools/bison/src/graphviz.h
index 0254ef748b..0254ef748b 100644
--- a/contrib/tools/bison/bison/src/graphviz.h
+++ b/contrib/tools/bison/src/graphviz.h
diff --git a/contrib/tools/bison/bison/src/ielr.c b/contrib/tools/bison/src/ielr.c
index 38156b384d..38156b384d 100644
--- a/contrib/tools/bison/bison/src/ielr.c
+++ b/contrib/tools/bison/src/ielr.c
diff --git a/contrib/tools/bison/bison/src/ielr.h b/contrib/tools/bison/src/ielr.h
index b60ae36348..b60ae36348 100644
--- a/contrib/tools/bison/bison/src/ielr.h
+++ b/contrib/tools/bison/src/ielr.h
diff --git a/contrib/tools/bison/bison/src/lalr.c b/contrib/tools/bison/src/lalr.c
index d99f960fbf..d99f960fbf 100644
--- a/contrib/tools/bison/bison/src/lalr.c
+++ b/contrib/tools/bison/src/lalr.c
diff --git a/contrib/tools/bison/bison/src/lalr.h b/contrib/tools/bison/src/lalr.h
index f483315747..f483315747 100644
--- a/contrib/tools/bison/bison/src/lalr.h
+++ b/contrib/tools/bison/src/lalr.h
diff --git a/contrib/tools/bison/bison/src/location.c b/contrib/tools/bison/src/location.c
index 662b2a12a0..662b2a12a0 100644
--- a/contrib/tools/bison/bison/src/location.c
+++ b/contrib/tools/bison/src/location.c
diff --git a/contrib/tools/bison/bison/src/location.h b/contrib/tools/bison/src/location.h
index 9c6e53c190..9c6e53c190 100644
--- a/contrib/tools/bison/bison/src/location.h
+++ b/contrib/tools/bison/src/location.h
diff --git a/contrib/tools/bison/bison/src/main.c b/contrib/tools/bison/src/main.c
index f391a9417e..f391a9417e 100644
--- a/contrib/tools/bison/bison/src/main.c
+++ b/contrib/tools/bison/src/main.c
diff --git a/contrib/tools/bison/bison/src/muscle-tab.c b/contrib/tools/bison/src/muscle-tab.c
index ca63ed21ad..ca63ed21ad 100644
--- a/contrib/tools/bison/bison/src/muscle-tab.c
+++ b/contrib/tools/bison/src/muscle-tab.c
diff --git a/contrib/tools/bison/bison/src/muscle-tab.h b/contrib/tools/bison/src/muscle-tab.h
index 2150327ba6..2150327ba6 100644
--- a/contrib/tools/bison/bison/src/muscle-tab.h
+++ b/contrib/tools/bison/src/muscle-tab.h
diff --git a/contrib/tools/bison/bison/src/named-ref.c b/contrib/tools/bison/src/named-ref.c
index 1693767918..1693767918 100644
--- a/contrib/tools/bison/bison/src/named-ref.c
+++ b/contrib/tools/bison/src/named-ref.c
diff --git a/contrib/tools/bison/bison/src/named-ref.h b/contrib/tools/bison/src/named-ref.h
index 84d02d7adb..84d02d7adb 100644
--- a/contrib/tools/bison/bison/src/named-ref.h
+++ b/contrib/tools/bison/src/named-ref.h
diff --git a/contrib/tools/bison/bison/src/nullable.c b/contrib/tools/bison/src/nullable.c
index a150f5f5c7..a150f5f5c7 100644
--- a/contrib/tools/bison/bison/src/nullable.c
+++ b/contrib/tools/bison/src/nullable.c
diff --git a/contrib/tools/bison/bison/src/nullable.h b/contrib/tools/bison/src/nullable.h
index 63a8ae3f14..63a8ae3f14 100644
--- a/contrib/tools/bison/bison/src/nullable.h
+++ b/contrib/tools/bison/src/nullable.h
diff --git a/contrib/tools/bison/bison/src/output.c b/contrib/tools/bison/src/output.c
index 61376ba390..9f08095c6b 100644
--- a/contrib/tools/bison/bison/src/output.c
+++ b/contrib/tools/bison/src/output.c
@@ -44,7 +44,7 @@
 
 #include "uniqstr.h"
 
-#include <contrib/tools/bison/bison/arcadia_root.h>
+#include <contrib/tools/bison/arcadia_root.h>
 
 #ifndef M4
 #define M4 (m4_path)
diff --git a/contrib/tools/bison/bison/src/output.h b/contrib/tools/bison/src/output.h
index 63a0ca803a..63a0ca803a 100644
--- a/contrib/tools/bison/bison/src/output.h
+++ b/contrib/tools/bison/src/output.h
diff --git a/contrib/tools/bison/bison/src/parse-gram.c b/contrib/tools/bison/src/parse-gram.c
index 5b862667e9..5b862667e9 100644
--- a/contrib/tools/bison/bison/src/parse-gram.c
+++ b/contrib/tools/bison/src/parse-gram.c
diff --git a/contrib/tools/bison/bison/src/parse-gram.h b/contrib/tools/bison/src/parse-gram.h
index 09358961d3..09358961d3 100644
--- a/contrib/tools/bison/bison/src/parse-gram.h
+++ b/contrib/tools/bison/src/parse-gram.h
diff --git a/contrib/tools/bison/bison/src/print-xml.c b/contrib/tools/bison/src/print-xml.c
index c30da729db..c30da729db 100644
--- a/contrib/tools/bison/bison/src/print-xml.c
+++ b/contrib/tools/bison/src/print-xml.c
diff --git a/contrib/tools/bison/bison/src/print-xml.h b/contrib/tools/bison/src/print-xml.h
index 251c2033b9..251c2033b9 100644
--- a/contrib/tools/bison/bison/src/print-xml.h
+++ b/contrib/tools/bison/src/print-xml.h
diff --git a/contrib/tools/bison/bison/src/print.c b/contrib/tools/bison/src/print.c
index 824bb4ae82..824bb4ae82 100644
--- a/contrib/tools/bison/bison/src/print.c
+++ b/contrib/tools/bison/src/print.c
diff --git a/contrib/tools/bison/bison/src/print.h b/contrib/tools/bison/src/print.h
index e1e254a9bc..e1e254a9bc 100644
--- a/contrib/tools/bison/bison/src/print.h
+++ b/contrib/tools/bison/src/print.h
diff --git a/contrib/tools/bison/bison/src/print_graph.c b/contrib/tools/bison/src/print_graph.c
index 7e429dbd10..7e429dbd10 100644
--- a/contrib/tools/bison/bison/src/print_graph.c
+++ b/contrib/tools/bison/src/print_graph.c
diff --git a/contrib/tools/bison/bison/src/print_graph.h b/contrib/tools/bison/src/print_graph.h
index 073ae988b6..073ae988b6 100644
--- a/contrib/tools/bison/bison/src/print_graph.h
+++ b/contrib/tools/bison/src/print_graph.h
diff --git a/contrib/tools/bison/bison/src/reader.c b/contrib/tools/bison/src/reader.c
index 95c595ed4e..95c595ed4e 100644
--- a/contrib/tools/bison/bison/src/reader.c
+++ b/contrib/tools/bison/src/reader.c
diff --git a/contrib/tools/bison/bison/src/reader.h b/contrib/tools/bison/src/reader.h
index ba6ffe6edc..ba6ffe6edc 100644
--- a/contrib/tools/bison/bison/src/reader.h
+++ b/contrib/tools/bison/src/reader.h
diff --git a/contrib/tools/bison/bison/src/reduce.c b/contrib/tools/bison/src/reduce.c
index eea11b1e20..eea11b1e20 100644
--- a/contrib/tools/bison/bison/src/reduce.c
+++ b/contrib/tools/bison/src/reduce.c
diff --git a/contrib/tools/bison/bison/src/reduce.h b/contrib/tools/bison/src/reduce.h
index bc12ed0e50..bc12ed0e50 100644
--- a/contrib/tools/bison/bison/src/reduce.h
+++ b/contrib/tools/bison/src/reduce.h
diff --git a/contrib/tools/bison/bison/src/relation.c b/contrib/tools/bison/src/relation.c
index 5746eca704..5746eca704 100644
--- a/contrib/tools/bison/bison/src/relation.c
+++ b/contrib/tools/bison/src/relation.c
diff --git a/contrib/tools/bison/bison/src/relation.h b/contrib/tools/bison/src/relation.h
index b44e1a7f98..b44e1a7f98 100644
--- a/contrib/tools/bison/bison/src/relation.h
+++ b/contrib/tools/bison/src/relation.h
diff --git a/contrib/tools/bison/bison/src/scan-code-c.c b/contrib/tools/bison/src/scan-code-c.c
index 7d37b766b5..7d37b766b5 100644
--- a/contrib/tools/bison/bison/src/scan-code-c.c
+++ b/contrib/tools/bison/src/scan-code-c.c
diff --git a/contrib/tools/bison/bison/src/scan-code.c b/contrib/tools/bison/src/scan-code.c
index 971f30241f..971f30241f 100644
--- a/contrib/tools/bison/bison/src/scan-code.c
+++ b/contrib/tools/bison/src/scan-code.c
diff --git a/contrib/tools/bison/bison/src/scan-code.h b/contrib/tools/bison/src/scan-code.h
index d5a15c1a1c..d5a15c1a1c 100644
--- a/contrib/tools/bison/bison/src/scan-code.h
+++ b/contrib/tools/bison/src/scan-code.h
diff --git a/contrib/tools/bison/bison/src/scan-gram-c.c b/contrib/tools/bison/src/scan-gram-c.c
index 2b4fc67b48..2b4fc67b48 100644
--- a/contrib/tools/bison/bison/src/scan-gram-c.c
+++ b/contrib/tools/bison/src/scan-gram-c.c
diff --git a/contrib/tools/bison/bison/src/scan-gram.c b/contrib/tools/bison/src/scan-gram.c
index 3c74a56bea..3c74a56bea 100644
--- a/contrib/tools/bison/bison/src/scan-gram.c
+++ b/contrib/tools/bison/src/scan-gram.c
diff --git a/contrib/tools/bison/bison/src/scan-gram.h b/contrib/tools/bison/src/scan-gram.h
index ee397ed2e7..ee397ed2e7 100644
--- a/contrib/tools/bison/bison/src/scan-gram.h
+++ b/contrib/tools/bison/src/scan-gram.h
diff --git a/contrib/tools/bison/bison/src/scan-skel-c.c b/contrib/tools/bison/src/scan-skel-c.c
index 3e1e73deb0..3e1e73deb0 100644
--- a/contrib/tools/bison/bison/src/scan-skel-c.c
+++ b/contrib/tools/bison/src/scan-skel-c.c
diff --git a/contrib/tools/bison/bison/src/scan-skel.c b/contrib/tools/bison/src/scan-skel.c
index 1e116da14d..1e116da14d 100644
--- a/contrib/tools/bison/bison/src/scan-skel.c
+++ b/contrib/tools/bison/src/scan-skel.c
diff --git a/contrib/tools/bison/bison/src/scan-skel.h b/contrib/tools/bison/src/scan-skel.h
index 019d38af5a..019d38af5a 100644
--- a/contrib/tools/bison/bison/src/scan-skel.h
+++ b/contrib/tools/bison/src/scan-skel.h
diff --git a/contrib/tools/bison/bison/src/state.c b/contrib/tools/bison/src/state.c
index c11b10f7dd..c11b10f7dd 100644
--- a/contrib/tools/bison/bison/src/state.c
+++ b/contrib/tools/bison/src/state.c
diff --git a/contrib/tools/bison/bison/src/state.h b/contrib/tools/bison/src/state.h
index 37cd9bf9ec..37cd9bf9ec 100644
--- a/contrib/tools/bison/bison/src/state.h
+++ b/contrib/tools/bison/src/state.h
diff --git a/contrib/tools/bison/bison/src/symlist.c b/contrib/tools/bison/src/symlist.c
index 531ec52fb8..531ec52fb8 100644
--- a/contrib/tools/bison/bison/src/symlist.c
+++ b/contrib/tools/bison/src/symlist.c
diff --git a/contrib/tools/bison/bison/src/symlist.h b/contrib/tools/bison/src/symlist.h
index c369f69bb1..c369f69bb1 100644
--- a/contrib/tools/bison/bison/src/symlist.h
+++ b/contrib/tools/bison/src/symlist.h
diff --git a/contrib/tools/bison/bison/src/symtab.c b/contrib/tools/bison/src/symtab.c
index c06fcd2621..c06fcd2621 100644
--- a/contrib/tools/bison/bison/src/symtab.c
+++ b/contrib/tools/bison/src/symtab.c
diff --git a/contrib/tools/bison/bison/src/symtab.h b/contrib/tools/bison/src/symtab.h
index bcc749511c..bcc749511c 100644
--- a/contrib/tools/bison/bison/src/symtab.h
+++ b/contrib/tools/bison/src/symtab.h
diff --git a/contrib/tools/bison/bison/src/system.h b/contrib/tools/bison/src/system.h
index 3267f2d24c..3267f2d24c 100644
--- a/contrib/tools/bison/bison/src/system.h
+++ b/contrib/tools/bison/src/system.h
diff --git a/contrib/tools/bison/bison/src/tables.c b/contrib/tools/bison/src/tables.c
index f06cba86b9..f06cba86b9 100644
--- a/contrib/tools/bison/bison/src/tables.c
+++ b/contrib/tools/bison/src/tables.c
diff --git a/contrib/tools/bison/bison/src/tables.h b/contrib/tools/bison/src/tables.h
index c631584d6e..c631584d6e 100644
--- a/contrib/tools/bison/bison/src/tables.h
+++ b/contrib/tools/bison/src/tables.h
diff --git a/contrib/tools/bison/bison/src/uniqstr.c b/contrib/tools/bison/src/uniqstr.c
index 4a62e989c9..4a62e989c9 100644
--- a/contrib/tools/bison/bison/src/uniqstr.c
+++ b/contrib/tools/bison/src/uniqstr.c
diff --git a/contrib/tools/bison/bison/src/uniqstr.h b/contrib/tools/bison/src/uniqstr.h
index f8e59ab24f..f8e59ab24f 100644
--- a/contrib/tools/bison/bison/src/uniqstr.h
+++ b/contrib/tools/bison/src/uniqstr.h
diff --git a/contrib/tools/bison/bison/ya.make b/contrib/tools/bison/ya.make
index 5b19fbee88..ad7b56cea3 100644
--- a/contrib/tools/bison/bison/ya.make
+++ b/contrib/tools/bison/ya.make
@@ -61,7 +61,7 @@ SRCS(
 
 CFLAGS(
     -Daccept=bison_accept
-    -DBISON_DATA_DIR="contrib/tools/bison/bison/data"
+    -DBISON_DATA_DIR="contrib/tools/bison/data"
 )
 
 PEERDIR(