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

5 files changed, 4 insertions, 13 deletions

diff --git a/contrib/tools/bison/lib/config-linux.h b/contrib/tools/bison/lib/config-linux.h
index 26302ef5369..8fa4b4f0920 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 d94d1b5ef78..07248a9798f 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 510a36f3e8a..75ea1d7d03a 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 41ddc3dfcb0..736cfb1bc69 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 18b15176ab6..8a93b4272bf 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