dev-util/catkin: set global etc destination to /etc, part of bug #598537

Package-Manager: portage-2.3.2
johu · Nov 28, 2016 · b33ece5 · b33ece5
1 parent b5c1221
commit b33ece5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/dev-util/catkin/catkin-0.7.4.ebuild → dev-util/catkin/catkin-0.7.4-r1.ebuild b/dev-util/catkin/catkin-0.7.4.ebuild → dev-util/catkin/catkin-0.7.4-r1.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/gnuinstalldirs.patch"
 	"${FILESDIR}/catkin_prefix_path_util_py.patch"
 	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/gnuinstalldirs.patch"
 	"${FILESDIR}/catkin_prefix_path_util_py.patch"
 	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch
@@ -0,0 +1,13 @@
+Index: catkin-0.7.4/cmake/all.cmake
+===================================================================
+--- catkin-0.7.4.orig/cmake/all.cmake
++++ catkin-0.7.4/cmake/all.cmake
+@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE)
+
+ # set global install destinations
+ set(CATKIN_GLOBAL_BIN_DESTINATION bin)
+-set(CATKIN_GLOBAL_ETC_DESTINATION etc)
++set(CATKIN_GLOBAL_ETC_DESTINATION ../etc)
+ set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
+ set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec)