diff --git a/cmake/genjava-catkin-api.cmake.em b/cmake/genjava-catkin-api.cmake.em
index f2cf35b02d216976f3d43cee22663c3e7b72fd46..fec8705c2ed98324cdf79c191add02668d5f8c98 100644
--- a/cmake/genjava-catkin-api.cmake.em
+++ b/cmake/genjava-catkin-api.cmake.em
@@ -2,7 +2,7 @@
 # location of scripts in develspace
   set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
 @[else]@
-  set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
+  set(GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
 @[end if]@
 
 set(GENJAVA_MESSAGE_ARTIFACTS_BIN ${GENJAVA_MESSAGE_ARTIFACTS_BIN_DIR}/genjava_message_artifacts)
diff --git a/cmake/genjava-extras.cmake.em b/cmake/genjava-extras.cmake.em
index edf6cb2061f504dd51e23233bf818e64eee36603..02c3e86b06110c07a8c75c862bec08dedc5e9abc 100644
--- a/cmake/genjava-extras.cmake.em
+++ b/cmake/genjava-extras.cmake.em
@@ -3,7 +3,7 @@
 set(GENJAVA_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
 @[else]@
 # location of scripts in installspace
-set(GENJAVA_BIN_DIR "${GENJAVA_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
+set(GENJAVA_BIN_DIR "${genjava_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
 @[end if]@
 
 set(GENJAVA_BIN ${GENJAVA_BIN_DIR}/genjava_gradle_project.py)