Revert "Restore bison's --print-localedir option (which will yield weird results in runtime though)"

This reverts commit 55fd53701f86aa798c20ad45965d5e4a64ddedf9, reversing
changes made to 89df74cf12526af7c176ae938b9d4580cac7a16e.
98b2cba6d69da3be15b0b6c851656398dfc0c371

6 files changed, 9 insertions, 25 deletions

diff --git a/contrib/tools/bison/lib/config-linux.h b/contrib/tools/bison/lib/config-linux.h
index 26302ef536..8fa4b4f092 100644
--- a/contrib/tools/bison/lib/config-linux.h
+++ b/contrib/tools/bison/lib/config-linux.h
@@ -1804,5 +1804,3 @@
 
 /* Define as a macro for copying va_list variables. */
 /* #undef va_copy */
-
-#define PACKAGE_COPYRIGHT_YEAR 2013
diff --git a/contrib/tools/bison/lib/config-win.h b/contrib/tools/bison/lib/config-win.h
index d94d1b5ef7..07248a9798 100644
--- a/contrib/tools/bison/lib/config-win.h
+++ b/contrib/tools/bison/lib/config-win.h
@@ -1701,9 +1701,6 @@ char *strsignal (int signum);
 /* Define as a macro for copying va_list variables. */
 #define va_copy gl_va_copy
 
-#define PACKAGE_COPYRIGHT_YEAR 2013
-#define LC_MESSAGES LC_ALL
-
 // Since Windows SDK 10 FILE is an internal opaque structure with no backward compatibility.
 // This code has been transplanted from Windows SDK
 // corecrt_internal_stdio.h
@@ -1745,4 +1742,3 @@ enum EWinSdk10ModeBits {
 };
 
 #define PENDING_OUTPUT_N_BYTES (((TWinSdk10File*)fp)->_ptr - ((TWinSdk10File*)fp)->_base)
-
diff --git a/contrib/tools/bison/lib/configmake-linux.h b/contrib/tools/bison/lib/configmake-linux.h
index 510a36f3e8..75ea1d7d03 100644
--- a/contrib/tools/bison/lib/configmake-linux.h
+++ b/contrib/tools/bison/lib/configmake-linux.h
@@ -1,4 +1,3 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 
 #define LIBDIR "/usr/local/lib"
-#define LOCALEDIR "/var/empty/bison-3.0/share/locale"
diff --git a/contrib/tools/bison/lib/configmake-win.h b/contrib/tools/bison/lib/configmake-win.h
index 41ddc3dfcb..736cfb1bc6 100644
--- a/contrib/tools/bison/lib/configmake-win.h
+++ b/contrib/tools/bison/lib/configmake-win.h
@@ -1 +1 @@
-#define LOCALEDIR ""
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
diff --git a/contrib/tools/bison/lib/configmake.h b/contrib/tools/bison/lib/configmake.h
index 18b15176ab..8a93b4272b 100644
--- a/contrib/tools/bison/lib/configmake.h
+++ b/contrib/tools/bison/lib/configmake.h
@@ -1,7 +1,5 @@
-#pragma once
-
-#if defined(_MSC_VER)
-#   include "configmake-win.h"
+#ifdef _MSC_VER
+	#include "configmake-win.h"
 #else
-#   include "configmake-linux.h"
+	#include "configmake-linux.h"
 #endif
diff --git a/contrib/tools/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c
index 7c6fcf7d34..d63bc7f9f5 100644
--- a/contrib/tools/bison/src/getargs.c
+++ b/contrib/tools/bison/src/getargs.c
@@ -365,15 +365,6 @@ FEATURE is a list of comma separated words that can include:\n\
       /* Don't output this redundant message for English locales.
          Note we still output for 'C' so that it gets included in the
          man page.  */
-      const char *lc_messages = setlocale (LC_MESSAGES, NULL);
-      if (lc_messages && !STREQ (lc_messages, "en_"))
-        /* TRANSLATORS: Replace LANG_CODE in this URL with your language
-           code <http://translationproject.org/team/LANG_CODE.html> to
-           form one of the URLs at http://translationproject.org/team/.
-           Otherwise, replace the entire URL with your translation team's
-           email address.  */
-        fputs (_("Report translation bugs to "
-                 "<http://translationproject.org/team/>.\n"), stdout);
       fputs (_("For complete documentation, run: info bison.\n"), stdout);
     }
 
@@ -397,7 +388,7 @@ version (void)
 
   fprintf (stdout,
            _("Copyright (C) %d Free Software Foundation, Inc.\n"),
-           PACKAGE_COPYRIGHT_YEAR);
+           2013);
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
@@ -485,8 +476,8 @@ enum
   LOCATIONS_OPTION = CHAR_MAX + 1,
   PRINT_LOCALEDIR_OPTION,
   PRINT_DATADIR_OPTION,
-  M4_PATH,
-  REPORT_FILE_OPTION
+  REPORT_FILE_OPTION,
+  M4_PATH
 };
 
 static struct option const long_options[] =
@@ -705,9 +696,11 @@ getargs (int argc, char *argv[])
                                       command_line_location (), true);
         break;
 
+#if 0
       case PRINT_LOCALEDIR_OPTION:
         printf ("%s\n", LOCALEDIR);
         exit (EXIT_SUCCESS);
+#endif
 
       case PRINT_DATADIR_OPTION:
         printf ("%s\n", pkgdatadir ());