From a8d871c929d3ce36027f0895d228193ac50076f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 4 Nov 2021 01:19:45 +0000
Subject: [PATCH 1/2] Add Niklas to AUTHORS and CONTRIBUTORS

---
 AUTHORS      | 1 +
 CONTRIBUTORS | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 1780c12ba..161038dc7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Guillaume Dumont <dumont.guillaume@gmail.com>
 Marco Wang <m.aesophor@gmail.com>
 Michael Tanner <michael@tannertaxpro.com>
 MiniLight <MiniLightAR@Gmail.com>
+Niklas Hambuechen <mail@nh2.me>
 romange <romange@users.noreply.github.com>
 Roman Perepelitsa <roman.perepelitsa@gmail.com>
 Sergiu Deitsch <sergiu.deitsch@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c1c44fe51..acf742914 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -38,6 +38,7 @@ Marco Wang <m.aesophor@gmail.com>
 Michael Darr <mdarr@matician.com>
 Michael Tanner <michael@tannertaxpro.com>
 MiniLight <MiniLightAR@Gmail.com>
+Niklas Hambuechen <mail@nh2.me>
 Peter Collingbourne <pcc@google.com>
 Rodrigo Queiro <rodrigoq@google.com>
 romange <romange@users.noreply.github.com>

From 57c636c02784f909e4b5d3c2f0ecbdbb47097266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 4 Nov 2021 01:20:16 +0000
Subject: [PATCH 2/2] cmake: Fix incorrect relative-path concatenation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a `-DCMAKE_INSTALL_PREFIX` is given, this could result in paths
like:

    /path/to/prefix//path/to/prefix/lib/cmake/glog/glog-modules.cmake

which was incorrect.

If a relative DESTINATION is given, it's assumed to be relative to the
install prefix.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62ebbccb1..5cb37f4e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -868,7 +868,7 @@ configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
 file (INSTALL
   \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
   DESTINATION
-  \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\")
+  \"${_glog_CMake_INSTALLDIR}\")
 "
   COMPONENT Development
 )