Put contrib/tools/bison under yamaker

fc8958be3a17b5e88f21aad92b3ed2b1630d4ad8

4 files changed, 3 insertions, 11 deletions

diff --git a/contrib/tools/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c
index adeaf8756d..0edbbd1ed8 100644
--- a/contrib/tools/bison/src/getargs.c
+++ b/contrib/tools/bison/src/getargs.c
@@ -388,7 +388,7 @@ version (void)
 
   fprintf (stdout,
            _("Copyright (C) %d Free Software Foundation, Inc.\n"),
-           2013);
+           PACKAGE_COPYRIGHT_YEAR);
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
diff --git a/contrib/tools/bison/src/getargs.h b/contrib/tools/bison/src/getargs.h
index 178fb94377..2bf103fcfe 100644
--- a/contrib/tools/bison/src/getargs.h
+++ b/contrib/tools/bison/src/getargs.h
@@ -43,7 +43,6 @@ extern bool yacc_flag;                  /* for -y */
 
 extern const char *m4_path;
 
-
 /* GLR_PARSER is true if the input file says to use the GLR
    (Generalized LR) parser, and to output some additional information
    used by the GLR algorithm.  */
diff --git a/contrib/tools/bison/src/main.c b/contrib/tools/bison/src/main.c
index f391a9417e..c5200fa937 100644
--- a/contrib/tools/bison/src/main.c
+++ b/contrib/tools/bison/src/main.c
@@ -60,11 +60,6 @@ main (int argc, char *argv[])
 {
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
-#if 0
-  (void) bindtextdomain (PACKAGE, LOCALEDIR);
-  (void) bindtextdomain ("bison-runtime", LOCALEDIR);
-  (void) textdomain (PACKAGE);
-#endif
 
   {
     char const *cp = getenv ("LC_CTYPE");
diff --git a/contrib/tools/bison/src/output.c b/contrib/tools/bison/src/output.c
index b5f098ce54..ede96799b5 100644
--- a/contrib/tools/bison/src/output.c
+++ b/contrib/tools/bison/src/output.c
@@ -46,11 +46,9 @@
 
 #include <contrib/tools/bison/arcadia_root.h>
 
-#ifndef M4
+#undef M4
 #define M4 (m4_path)
-#endif
 
-#ifndef PKGDATADIR
 #define STR(a) XSTR(a)
 #define XSTR(a) #a
 
@@ -62,8 +60,8 @@ default_pkgdatadir()
         arc_path = ArcadiaRoot();
     return uniqstr_vsprintf("%s/" STR(BISON_DATA_DIR), arc_path);
 }
+#undef PKGDATADIR
 #define PKGDATADIR (default_pkgdatadir())
-#endif
 
 static struct obstack format_obstack;