1 files changed, 4 insertions, 5 deletions

diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
index 871a9e92..7e6c9eb9 100644
--- a/other/CMakeLists.txt
+++ b/other/CMakeLists.txt
@@ -1,13 +1,10 @@
 cmake_minimum_required(VERSION 2.6.0)
 
 cmake_policy(SET CMP0011 NEW)
-SET(USER_NAME $ENV{USERNAME} CACHE STRING UserName)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)
 
 if(WIN32)
-  file(MAKE_DIRECTORY "C:/Users/${USER_NAME}/AppData/Roaming/.config/tox")
-  file(INSTALL DHTservers DESTINATION "C:/Users/${USER_NAME}/AppData/Roaming/.config/tox")
+  file(MAKE_DIRECTORY "$ENV{APPDATA}/.config/tox")
+  file(INSTALL DHTservers DESTINATION "$ENV{APPDATA}/.config/tox")
 else()
   set(HOME "$ENV{HOME}")
   if(APPLE)
@@ -19,6 +16,8 @@ else()
   endif()
 endif()
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)
+
 if(LINUX)
         add_subdirectory(bootstrap_serverdaemon)
 endif()