From 9628f38be3475c619085eface13031c951fb1f36 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 26 Jul 2019 18:20:32 +0200
Subject: [PATCH] build: Uniquify config macros.

* configure (main): Rename VERSION to MES_VERSION, pkgdatadir to
MES_PKGDATADIR.  Update users.
* configure.sh (mes_system): Likewise.
* src/mes.c (mes_symbols): Update.
(open_boot): Update.
* scaffold/cons-mes.c (main): Update.
* simple.sh: Update.
---
 configure           | 4 ++--
 configure.sh        | 4 ++--
 scaffold/cons-mes.c | 2 +-
 simple.sh           | 8 ++++----
 src/mes.c           | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 39c00f5c..4d88bb9b 100755
--- a/configure
+++ b/configure
@@ -656,8 +656,8 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                   (display "#undef SYSTEM_LIBC
 "))
               (display (string-append "
-#define VERSION \"" VERSION "\"
-#define pkgdatadir \"" pkgdatadir "\"
+#define MES_VERSION \"" VERSION "\"
+#define MES_PKGDATADIR \"" pkgdatadir "\"
 ")))))
         (substitute (string-append srcdest "build-aux/config.make.in") pairs #:target ".config.make"))
 
diff --git a/configure.sh b/configure.sh
index cf25f71b..f8ea3acd 100755
--- a/configure.sh
+++ b/configure.sh
@@ -269,8 +269,8 @@ else
 EOF
 fi
 cat >> include/mes/config.h <<EOF
-#define VERSION "$VERSION"
-#define pkgdatadir "$pkgdatadir"
+#define MES_VERSION "$VERSION"
+#define MES_PKGDATADIR "$pkgdatadir"
 EOF
 
 cat <<EOF
diff --git a/scaffold/cons-mes.c b/scaffold/cons-mes.c
index 09028728..2552db62 100644
--- a/scaffold/cons-mes.c
+++ b/scaffold/cons-mes.c
@@ -941,7 +941,7 @@ main (int argc, char *argv[])
   if (argc > 1 && !strcmp (argv[1], "--version"))
     {
       eputs ("Mes ");
-      return eputs (VERSION);
+      return eputs (MES_VERSION);
     };
 #else
   if (argc > 1 && !strcmp (argv[1], "--version"))
diff --git a/simple.sh b/simple.sh
index 4c096463..b0b02d7d 100755
--- a/simple.sh
+++ b/simple.sh
@@ -32,8 +32,8 @@ mes_cpu=x86_64
 mes_bits=64
 cat > include/mes/config.h <<EOF
 #define SYSTEM_LIBC 1
-#define VERSION "git"
-#define pkgdatadir "/usr/local/share/mes"
+#define MES_VERSION "git"
+#define MES_PKGDATADIR "/usr/local/share/mes"
 EOF
 
 ## Build ##
@@ -124,8 +124,8 @@ mes_cpu=x86_64
 #mes_cpu=x86
 cat > include/mes/config.h <<EOF
 // #define SYSTEM_LIBC 0
-#define VERSION "git"
-#define pkgdatadir "/usr/local/share/mes"
+#define MES_VERSION "git"
+#define MES_PKGDATADIR "/usr/local/share/mes"
 EOF
 
 ## Build ##
diff --git a/src/mes.c b/src/mes.c
index 91e958d8..81de6a73 100644
--- a/src/mes.c
+++ b/src/mes.c
@@ -1379,7 +1379,7 @@ mes_symbols ()                  ///((internal))
   a = acons (cell_symbol_current_module, cell_symbol_current_module, a);
   a = acons (cell_symbol_call_with_current_continuation, cell_call_with_current_continuation, a);
 
-  a = acons (cell_symbol_mes_version, MAKE_STRING0 (VERSION), a);
+  a = acons (cell_symbol_mes_version, MAKE_STRING0 (MES_VERSION), a);
   a = acons (cell_symbol_mes_datadir, MAKE_STRING0 (g_datadir), a);
 
   a = acons (cell_type_bytes, MAKE_NUMBER (TBYTES), a);
@@ -1778,7 +1778,7 @@ open_boot ()
   if (g_debug > 1)
     {
       eputs (";;; pkgdatadir=");
-      eputs (pkgdatadir);
+      eputs (MES_PKGDATADIR);
       eputs ("\n");
     }
   if (getenv ("MES_BOOT"))
@@ -1802,7 +1802,7 @@ open_boot ()
     }
   if (__stdin < 0)
     {
-      strcpy (g_datadir, pkgdatadir);
+      strcpy (g_datadir, MES_PKGDATADIR);
       strcpy (file_name, g_datadir);
       strcpy (file_name + strlen (file_name), "/module/mes/");
       __stdin = try_open_boot (file_name, boot, "pkgdatadir");