fix regression of #676

ros · Aug 18, 2014 · 6604fa7 · 6604fa7
1 parent b738a3e
commit 6604fa7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cmake/catkin_generate_environment.cmake b/cmake/catkin_generate_environment.cmake
@@ -50,10 +50,13 @@ function(catkin_generate_environment)
 
   if(NOT CATKIN_BUILD_BINARY_PACKAGE)
     # install empty workspace marker if it doesn't already exist
-    install(CODE " 
-      if (NOT EXISTS \"\${CMAKE_INSTALL_PREFIX}/.catkin\") 
-        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/.catkin\" \"\") 
-      endif()") 
+    install(CODE "
+      if (NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")
+        file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")
+      endif()
+      if (NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/.catkin\")
+        file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/.catkin\" \"\")
+      endif()")
 
     # generate and install Python setup util
     configure_file(${catkin_EXTRAS_DIR}/templates/_setup_util.py.in