Address issue #1

potassco · Aug 30, 2017 · 5738b7f · 5738b7f
1 parent 9b7b706
commit 5738b7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,5 +1,8 @@
 add_executable(lpconvert lpconvert.cpp)
 target_link_libraries(lpconvert libpotassco)
 set_target_properties(lpconvert PROPERTIES FOLDER exe)
-
-install(TARGETS lpconvert EXPORT lpconvert DESTINATION "bin")
+set(install_dir bin)
+if (CMAKE_INSTALL_BINDIR)
+	set(install_dir ${CMAKE_INSTALL_BINDIR})
+endif()
+install(TARGETS lpconvert EXPORT lpconvert DESTINATION "${install_dir}")
diff --git a/src/string_convert.cpp b/src/string_convert.cpp
@@ -54,7 +54,7 @@ static double strtod_l(const char* x, char** end, const my_locale_t& loc) {
 inline void freelocale(const my_locale_t&) {}
 inline my_locale_t default_locale()        { return std::locale::classic(); }
 #else
-#include <xlocale.h>
+#include <locale.h>
 typedef locale_t my_locale_t;
 inline my_locale_t default_locale() { return newlocale(LC_ALL_MASK, "C", 0); }
 #endif