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

55fd53701f86aa798c20ad45965d5e4a64ddedf9

5 files changed, 12 insertions, 4 deletions

diff --git a/contrib/tools/bison/lib/config-linux.h b/contrib/tools/bison/lib/config-linux.h
index 8fa4b4f092..26302ef536 100644
--- a/contrib/tools/bison/lib/config-linux.h
+++ b/contrib/tools/bison/lib/config-linux.h
@@ -1804,3 +1804,5 @@
 
 /* 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 cb29c4cc78..17a8033596 100644
--- a/contrib/tools/bison/lib/config-win.h
+++ b/contrib/tools/bison/lib/config-win.h
@@ -1709,3 +1709,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
diff --git a/contrib/tools/bison/lib/configmake-linux.h b/contrib/tools/bison/lib/configmake-linux.h
index 75ea1d7d03..510a36f3e8 100644
--- a/contrib/tools/bison/lib/configmake-linux.h
+++ b/contrib/tools/bison/lib/configmake-linux.h
@@ -1,3 +1,4 @@
 /* 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 736cfb1bc6..41ddc3dfcb 100644
--- a/contrib/tools/bison/lib/configmake-win.h
+++ b/contrib/tools/bison/lib/configmake-win.h
@@ -1 +1 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+#define LOCALEDIR ""
diff --git a/contrib/tools/bison/lib/configmake.h b/contrib/tools/bison/lib/configmake.h
index 8a93b4272b..18b15176ab 100644
--- a/contrib/tools/bison/lib/configmake.h
+++ b/contrib/tools/bison/lib/configmake.h
@@ -1,5 +1,7 @@
-#ifdef _MSC_VER
-	#include "configmake-win.h"
+#pragma once
+
+#if defined(_MSC_VER)
+#   include "configmake-win.h"
 #else
-	#include "configmake-linux.h"
+#   include "configmake-linux.h"
 #endif