From 401383b4a123e8ae1b1421a4f126476f8aeb3f36 Mon Sep 17 00:00:00 2001
From: Zoltan Puskas <zoltan@sinustrom.info>
Date: Sun, 8 Apr 2018 20:40:37 -0700
Subject: [PATCH] Add changelog file, fix online man page URLs, CMake multilib
 support

---
 CHANGELOG      | 8 ++++++++
 CMakeLists.txt | 9 +++++++--
 README.md      | 4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..09b2e08
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,8 @@
+oath-uri - Changelog
+
+Version 1.0.0 (2018.04.08.)
+---------------------------
+
+* Inital public release
+* liboathuri implements full support for Google Authenticator key URI format
+* oathuri CLI implements generating URI based on user input
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e7c34..38b1965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ PROJECT(
     oath-uri
     LANGUAGES C
     VERSION 1.0.0
-    DESCRIPTION "Oath Key URI generator library and CLI"
+    DESCRIPTION "OATH Key URI generator library and CLI"
 )
 
 ## CMake settings
@@ -36,6 +36,11 @@ IF(NOT CMAKE_BUILD_TYPE)
     SET( CMAKE_BUILD_TYPE "Release" )
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+# Allow for overriding default lib installation path (needed on multiarch)
+if(NOT DEFINED LIB_INSTALL_DIR)
+  set(LIB_INSTALL_DIR lib)
+endif()
+
 
 ## Feature switches
 OPTION( OATHURI_CLI "Build command line interface" ON )
@@ -64,7 +69,7 @@ TARGET_LINK_LIBRARIES( oathuri-lib PUBLIC ${CURL_LIBRARIES} )
 
 INSTALL(
     TARGETS oathuri-lib
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     PUBLIC_HEADER DESTINATION include
 )
 INSTALL(
diff --git a/README.md b/README.md
index d6c68a2..bf9d1c7 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ The `oathuri` command line tool is intended to be used in tandem with
 [qrencode](https://fukuchi.org/works/qrencode/) to provide an easy way to
 generate authenticator application key sharing URIs and associated QR codes.
 Find out how to use it by reading the
-[oathuri(1)](https://sinustrom.info/projects/oath-uri/man/oathuri/) man page.
+[oathuri(1)](https://sinustrom.info/projects/oath-uri/man/1/oathuri/) man page.
 
 `liboathuri` is used under the hood for this and it's also available to be used
 by your C/C++ software. To learn the API read the
-[oathuri.h(3)](https://sinustrom.info/projects/oath-uri/man/oathuri_h/) man page.
+[oathuri.h(3)](https://sinustrom.info/projects/oath-uri/man/3/oathuri_h/) man page.
 
 The code is made available in the hopes of making two-factor authentication
 available to wider audiences in a more user friendly (plus yet another) way and