41 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b80335..5165b365 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ macro(opentrack_library n dir)
     target_link_libraries(${n} ${MY_QT_LIBS})
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
         SET_TARGET_PROPERTIES(${n} PROPERTIES
-            LINK_FLAGS "${foolib_LINK} -Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/${version-script}-version-script.txt"
+            LINK_FLAGS "${foolib_LINK} -Wl,--version-script=${CMAKE_SOURCE_DIR}/opentrack/${version-script}-version-script.txt"
             COMPILE_FLAGS "${foolib_COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden"
         )
     else()
@@ -472,7 +472,7 @@ endif()
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION .)
 
 install(FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe" DESTINATION .)
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/settings" "${CMAKE_SOURCE_DIR}/facetracknoir/clientfiles" DESTINATION .)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/settings" "${CMAKE_SOURCE_DIR}/clientfiles" DESTINATION .)
 
 if(NOT WIN32 AND SDK_WINE_PREFIX AND NOT SDK_WINE_NO_WRAPPER)
     install(FILES "${CMAKE_BINARY_DIR}/opentrack-wrapper-wine.exe.so"
diff --git a/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml b/clientfiles/FlightGear/Protocol/headtracker.xml
index 8c14119a..8c14119a 100644
--- a/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml
+++ b/clientfiles/FlightGear/Protocol/headtracker.xml
diff --git a/facetracknoir/clientfiles/FlightGear/readme.txt b/clientfiles/FlightGear/readme.txt
index 48cee837..48cee837 100644
--- a/facetracknoir/clientfiles/FlightGear/readme.txt
+++ b/clientfiles/FlightGear/readme.txt
diff --git a/facetracknoir/clientfiles/Tir4Fun/npclient.dll b/clientfiles/Tir4Fun/npclient.dll
index e392442e..e392442e 100644
--- a/facetracknoir/clientfiles/Tir4Fun/npclient.dll
+++ b/clientfiles/Tir4Fun/npclient.dll
diff --git a/facetracknoir/clientfiles/Tir4Fun/readme.txt b/clientfiles/Tir4Fun/readme.txt
index d64af301..d64af301 100644
--- a/facetracknoir/clientfiles/Tir4Fun/readme.txt
+++ b/clientfiles/Tir4Fun/readme.txt
diff --git a/facetracknoir/clientfiles/Tir4Fun/tir4fun.exe b/clientfiles/Tir4Fun/tir4fun.exe
index a51eced0..a51eced0 100644
--- a/facetracknoir/clientfiles/Tir4Fun/tir4fun.exe
+++ b/clientfiles/Tir4Fun/tir4fun.exe
diff --git a/facetracknoir/clientfiles/aruco/aruco_create_marker.exe b/clientfiles/aruco/aruco_create_marker.exe
index 4400e80e..4400e80e 100644
--- a/facetracknoir/clientfiles/aruco/aruco_create_marker.exe
+++ b/clientfiles/aruco/aruco_create_marker.exe
diff --git a/facetracknoir/clientfiles/aruco/test3.jpg b/clientfiles/aruco/test3.jpg
index 2ff6dbd0..2ff6dbd0 100644
--- a/facetracknoir/clientfiles/aruco/test3.jpg
+++ b/clientfiles/aruco/test3.jpg
diff --git a/facetracknoir/clientfiles/cfs3/readme.txt b/clientfiles/cfs3/readme.txt
index e51cebfa..e51cebfa 100644
--- a/facetracknoir/clientfiles/cfs3/readme.txt
+++ b/clientfiles/cfs3/readme.txt
diff --git a/facetracknoir/clientfiles/cfs3/tirviews.dll b/clientfiles/cfs3/tirviews.dll
index a1fb306f..a1fb306f 100644
--- a/facetracknoir/clientfiles/cfs3/tirviews.dll
+++ b/clientfiles/cfs3/tirviews.dll
diff --git a/facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg b/clientfiles/cute-octopus-vector-material_15-1831.jpg
index c4e5318f..c4e5318f 100644
--- a/facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg
+++ b/clientfiles/cute-octopus-vector-material_15-1831.jpg
diff --git a/facetracknoir/clientfiles/freetracktest/freetracktest.exe b/clientfiles/freetracktest/freetracktest.exe
index 2965a07f..2965a07f 100644
--- a/facetracknoir/clientfiles/freetracktest/freetracktest.exe
+++ b/clientfiles/freetracktest/freetracktest.exe
diff --git a/facetracknoir/clientfiles/freetracktest/readme.txt b/clientfiles/freetracktest/readme.txt
index ca40906f..ca40906f 100644
--- a/facetracknoir/clientfiles/freetracktest/readme.txt
+++ b/clientfiles/freetracktest/readme.txt
diff --git a/facetracknoir/clientfiles/fs2002 and fs2004/fsuipc.dll b/clientfiles/fs2002 and fs2004/fsuipc.dll
index 264d14c5..264d14c5 100644
--- a/facetracknoir/clientfiles/fs2002 and fs2004/fsuipc.dll
+++ b/clientfiles/fs2002 and fs2004/fsuipc.dll
diff --git a/facetracknoir/clientfiles/glovepie/facetracknoir2trackir.pie b/clientfiles/glovepie/facetracknoir2trackir.pie
index d0839e5d..d0839e5d 100644
--- a/facetracknoir/clientfiles/glovepie/facetracknoir2trackir.pie
+++ b/clientfiles/glovepie/facetracknoir2trackir.pie
diff --git a/facetracknoir/clientfiles/glovepie/readme.txt b/clientfiles/glovepie/readme.txt
index 3639e26b..3639e26b 100644
--- a/facetracknoir/clientfiles/glovepie/readme.txt
+++ b/clientfiles/glovepie/readme.txt
diff --git a/facetracknoir/clientfiles/make-csv.pl b/clientfiles/make-csv.pl
index ee60364e..ee60364e 100755
--- a/facetracknoir/clientfiles/make-csv.pl
+++ b/clientfiles/make-csv.pl
diff --git a/facetracknoir/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg b/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg
index 052c6899..052c6899 100644
--- a/facetracknoir/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg
+++ b/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg
diff --git a/facetracknoir/clientfiles/ppjoy/readme.txt b/clientfiles/ppjoy/readme.txt
index 20c52111..20c52111 100644
--- a/facetracknoir/clientfiles/ppjoy/readme.txt
+++ b/clientfiles/ppjoy/readme.txt
diff --git a/facetracknoir/clientfiles/very-important-source-code/README-CREDIT.txt b/clientfiles/very-important-source-code/README-CREDIT.txt
index 82214139..82214139 100644
--- a/facetracknoir/clientfiles/very-important-source-code/README-CREDIT.txt
+++ b/clientfiles/very-important-source-code/README-CREDIT.txt
diff --git a/facetracknoir/clientfiles/very-important-source-code/ft_tester/Makefile.am b/clientfiles/very-important-source-code/ft_tester/Makefile.am
index 02747edb..02747edb 100644
--- a/facetracknoir/clientfiles/very-important-source-code/ft_tester/Makefile.am
+++ b/clientfiles/very-important-source-code/ft_tester/Makefile.am
diff --git a/facetracknoir/clientfiles/very-important-source-code/ft_tester/Makefile.in b/clientfiles/very-important-source-code/ft_tester/Makefile.in
index d1fff34d..d1fff34d 100644
--- a/facetracknoir/clientfiles/very-important-source-code/ft_tester/Makefile.in
+++ b/clientfiles/very-important-source-code/ft_tester/Makefile.in
diff --git a/facetracknoir/clientfiles/very-important-source-code/ft_tester/fttester.rc.in b/clientfiles/very-important-source-code/ft_tester/fttester.rc.in
index 332f3c73..332f3c73 100644
--- a/facetracknoir/clientfiles/very-important-source-code/ft_tester/fttester.rc.in
+++ b/clientfiles/very-important-source-code/ft_tester/fttester.rc.in
diff --git a/facetracknoir/clientfiles/very-important-source-code/ft_tester/main.cpp b/clientfiles/very-important-source-code/ft_tester/main.cpp
index a737f88f..a737f88f 100644
--- a/facetracknoir/clientfiles/very-important-source-code/ft_tester/main.cpp
+++ b/clientfiles/very-important-source-code/ft_tester/main.cpp
diff --git a/facetracknoir/clientfiles/very-important-source-code/ft_tester/resource.h b/clientfiles/very-important-source-code/ft_tester/resource.h
index 8bba17b4..8bba17b4 100644
--- a/facetracknoir/clientfiles/very-important-source-code/ft_tester/resource.h
+++ b/clientfiles/very-important-source-code/ft_tester/resource.h
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient.h b/clientfiles/very-important-source-code/important-stuff/NPClient.h
index 770e1c71..770e1c71 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient.h
+++ b/clientfiles/very-important-source-code/important-stuff/NPClient.h
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient.spec b/clientfiles/very-important-source-code/important-stuff/NPClient.spec
index 7fe5f1b4..7fe5f1b4 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient.spec
+++ b/clientfiles/very-important-source-code/important-stuff/NPClient.spec
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h b/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h
index b0bab5db..b0bab5db 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h
+++ b/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient_main.c b/clientfiles/very-important-source-code/important-stuff/NPClient_main.c
index f892f89e..f892f89e 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/NPClient_main.c
+++ b/clientfiles/very-important-source-code/important-stuff/NPClient_main.c
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/game_data.c b/clientfiles/very-important-source-code/important-stuff/game_data.c
index f80a7d44..f80a7d44 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/game_data.c
+++ b/clientfiles/very-important-source-code/important-stuff/game_data.c
diff --git a/facetracknoir/clientfiles/very-important-source-code/important-stuff/game_data.h b/clientfiles/very-important-source-code/important-stuff/game_data.h
index b71f7a15..b71f7a15 100644
--- a/facetracknoir/clientfiles/very-important-source-code/important-stuff/game_data.h
+++ b/clientfiles/very-important-source-code/important-stuff/game_data.h
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/Makefile.am b/clientfiles/very-important-source-code/tester/Makefile.am
index e025209a..e025209a 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/Makefile.am
+++ b/clientfiles/very-important-source-code/tester/Makefile.am
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/Makefile.in b/clientfiles/very-important-source-code/tester/Makefile.in
index cc49d754..cc49d754 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/Makefile.in
+++ b/clientfiles/very-important-source-code/tester/Makefile.in
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/main.cpp b/clientfiles/very-important-source-code/tester/main.cpp
index 95ca0d9b..95ca0d9b 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/main.cpp
+++ b/clientfiles/very-important-source-code/tester/main.cpp
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/npifc.c b/clientfiles/very-important-source-code/tester/npifc.c
index b036464e..b036464e 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/npifc.c
+++ b/clientfiles/very-important-source-code/tester/npifc.c
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/npifc.h b/clientfiles/very-important-source-code/tester/npifc.h
index d580e16d..d580e16d 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/npifc.h
+++ b/clientfiles/very-important-source-code/tester/npifc.h
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/npview.rc.in b/clientfiles/very-important-source-code/tester/npview.rc.in
index 231002f1..231002f1 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/npview.rc.in
+++ b/clientfiles/very-important-source-code/tester/npview.rc.in
diff --git a/facetracknoir/clientfiles/very-important-source-code/tester/resource.h b/clientfiles/very-important-source-code/tester/resource.h
index 328d9cb7..328d9cb7 100644
--- a/facetracknoir/clientfiles/very-important-source-code/tester/resource.h
+++ b/clientfiles/very-important-source-code/tester/resource.h
diff --git a/facetracknoir/clientfiles/vjoy/VJoy.dll b/clientfiles/vjoy/VJoy.dll
index e3446675..e3446675 100644
--- a/facetracknoir/clientfiles/vjoy/VJoy.dll
+++ b/clientfiles/vjoy/VJoy.dll
diff --git a/facetracknoir/mingw-version-script.txt b/opentrack/mingw-version-script.txt
index fe20ad37..fe20ad37 100644
--- a/facetracknoir/mingw-version-script.txt
+++ b/opentrack/mingw-version-script.txt
diff --git a/facetracknoir/posix-version-script.txt b/opentrack/posix-version-script.txt
index 97edb9aa..97edb9aa 100644
--- a/facetracknoir/posix-version-script.txt
+++ b/opentrack/posix-version-script.txt