Rename VERSION to KIWIX_TOOLS_VERSION to avoid collision

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

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

src/version.h

@@ -17,16 +17,16 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef _KIWIX_TOOL_VERSION_H_
+#ifndef _KIWIX_TOOLS_VERSION_H_
-#define _KIWIX_TOOL_VERSION_H_
+#define _KIWIX_TOOLS_VERSION_H_
 
-#ifndef VERSION
+#ifndef KIWIX_TOOLS_VERSION
-  #define VERSION "undefined"
+  #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_