From 3fa28d2ba554687ffb17e8c5dd64b7ef4ba81e9e Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Mon, 3 Nov 2014 18:07:56 +0100
Subject: Revert "Merge pull request #1381 from xzfc/master"

This reverts commit 6c0a596dacd7672e650847f1ed15e6a2a67b1483, reversing
changes made to 33d3a7c83b2f1d2cda22b53bf82d68267154cdfd.
---
 cmake/GenerateHelptags.cmake | 12 +++++++++---
 cmake/InstallHelpers.cmake   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake
index 437832abc9..2e923ab45f 100644
--- a/cmake/GenerateHelptags.cmake
+++ b/cmake/GenerateHelptags.cmake
@@ -1,6 +1,12 @@
-file(TO_CMAKE_PATH
-  "${PREFIX}/share/nvim/runtime/doc"
-  HELPTAGS_WORKING_DIRECTORY)
+if(ENV{DESTDIR})
+  file(TO_CMAKE_PATH
+    "$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc"
+    HELPTAGS_WORKING_DIRECTORY)
+else()
+  file(TO_CMAKE_PATH
+    "${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc"
+    HELPTAGS_WORKING_DIRECTORY)
+endif()
 
 message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.")
 
diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake
index bf1ef1c0d6..faf980bd47 100644
--- a/cmake/InstallHelpers.cmake
+++ b/cmake/InstallHelpers.cmake
@@ -22,7 +22,7 @@ function(create_install_dir_with_perms)
 
   install(CODE
     "
-    if(DEFINED ENV{DESTDIR})
+    if(ENV{DESTDIR})
       set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX})
     else()
       set(PREFIX \${CMAKE_INSTALL_PREFIX})
-- 
cgit 


From cc7199f0e5ad6f03beb80eee81be8ca0f4ba2459 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Mon, 3 Nov 2014 19:46:40 +0100
Subject: CMake: Fix helptags generation.

---
 cmake/GenerateHelptags.cmake | 2 +-
 cmake/InstallHelpers.cmake   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/GenerateHelptags.cmake b/cmake/GenerateHelptags.cmake
index 2e923ab45f..090cdf8ef4 100644
--- a/cmake/GenerateHelptags.cmake
+++ b/cmake/GenerateHelptags.cmake
@@ -1,4 +1,4 @@
-if(ENV{DESTDIR})
+if(DEFINED ENV{DESTDIR})
   file(TO_CMAKE_PATH
     "$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc"
     HELPTAGS_WORKING_DIRECTORY)
diff --git a/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake
index faf980bd47..a23bf63ab3 100644
--- a/cmake/InstallHelpers.cmake
+++ b/cmake/InstallHelpers.cmake
@@ -23,6 +23,7 @@ function(create_install_dir_with_perms)
   install(CODE
     "
     if(ENV{DESTDIR})
+      # TODO(fwalch): Is this branch ever taken (#1381, #1387)?
       set(PREFIX \$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX})
     else()
       set(PREFIX \${CMAKE_INSTALL_PREFIX})
-- 
cgit