From 109b6e2fa5b17014f612aea2297fe8f982a10d93 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Tue, 2 Nov 2021 09:35:03 +0000
Subject: [PATCH] Remove one remaining use of N2N_OSNAME and cleanup

---
 CMakeLists.txt    | 3 +--
 win32/winconfig.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1f286d..ddec7ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # N2n release information
-set(N2N_OSNAME ${CMAKE_SYSTEM_NAME})
 execute_process(
     COMMAND scripts/version.sh
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -28,7 +27,7 @@ string(STRIP "${PACKAGE_VERSION}" PACKAGE_VERSION)
 MESSAGE(STATUS "Build for version: ${PACKAGE_VERSION}")
 
 add_definitions(-DCMAKE_BUILD)
-add_definitions(-DPACKAGE_OSNAME="${N2N_OSNAME}" -DN2N_OSNAME="${N2N_OSNAME}")
+add_definitions(-DPACKAGE_OSNAME="${CMAKE_SYSTEM_NAME}")
 add_definitions(-DPACKAGE_VERSION="${PACKAGE_VERSION}")
 
 
diff --git a/win32/winconfig.h b/win32/winconfig.h
index 8bfcb49..aa9794a 100644
--- a/win32/winconfig.h
+++ b/win32/winconfig.h
@@ -2,7 +2,7 @@
 
 /* OS name */
 #ifndef PACKAGE_OSNAME
-#define PACKAGE_OSNAME N2N_OSNAME
+#define PACKAGE_OSNAME "windows"
 #endif
 
 /* Define to the version of this package. */