From ca943b9d0bf55380f990d193cd735b55b14f11f3 Mon Sep 17 00:00:00 2001
From: Kelson <kelson@kiwix.org>
Date: Sun, 25 Aug 2019 18:30:11 +0200
Subject: [PATCH] Rename VERSION to KIWIX_TOOLS_VERSION to avoid collision

---
 README.md     |  4 ----
 meson.build   |  2 +-
 src/version.h | 12 ++++++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ebcb481..268ff35 100644
--- a/README.md
+++ b/README.md
@@ -121,11 +121,7 @@ If you want to uninstall the Kiwix tools:
 ninja -C build uninstall
 ```
 
-<<<<<<< HEAD
 Like for the installation, you might need to run the command as `root`
-=======
-Like for the installation, you might need to run the command as root
->>>>>>> Various README.md improvements
 (or using `sudo`).
 
 Docker
diff --git a/meson.build b/meson.build
index a706b72..0d2fe43 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('kiwix-tools', 'cpp',
 
 compiler = meson.get_compiler('cpp')
 
-add_global_arguments('-DVERSION="@0@"'.format(meson.project_version()), language : 'cpp')
+add_global_arguments('-DKIWIX_TOOLS_VERSION="@0@"'.format(meson.project_version()), language : 'cpp')
 
 static_linkage = get_option('static-linkage')
 if static_linkage
diff --git a/src/version.h b/src/version.h
index 6555380..0b556cf 100644
--- a/src/version.h
+++ b/src/version.h
@@ -17,16 +17,16 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef _KIWIX_TOOL_VERSION_H_
-#define _KIWIX_TOOL_VERSION_H_
+#ifndef _KIWIX_TOOLS_VERSION_H_
+#define _KIWIX_TOOLS_VERSION_H_
 
-#ifndef VERSION
-  #define VERSION "undefined"
+#ifndef KIWIX_TOOLS_VERSION
+  #define KIWIX_TOOLS_VERSION "undefined"
 #endif
 
 void version()
 {
-  std::cout << VERSION << std::endl;
+  std::cout << KIWIX_TOOLS_VERSION << std::endl;
 }
 
-#endif //_KIWIX_TOOL_VERSION_H_
+#endif //_KIWIX_TOOLs_VERSION_H_