diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-11-28 14:55:54 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-11-28 16:04:28 +0100 |
| commit | b33ece56c59ae0b1c186af967c552efaa9dcd361 (patch) | |
| tree | 353634ed008b968503aa1bb98a06345fd5ea9510 | |
| parent | package.mask: Enhanced sys-devel/flex mask. (diff) | |
| download | gentoo-b33ece56.tar.gz gentoo-b33ece56.tar.bz2 gentoo-b33ece56.zip | |
dev-util/catkin: set global etc destination to /etc, part of bug #598537
Package-Manager: portage-2.3.2
| -rw-r--r-- | dev-util/catkin/catkin-0.7.4-r1.ebuild (renamed from dev-util/catkin/catkin-0.7.4.ebuild) | 1 | ||||
| -rw-r--r-- | dev-util/catkin/catkin-9999.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/catkin/files/etc.patch | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/dev-util/catkin/catkin-0.7.4.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild index ada4a5e9254e..c98407801d62 100644 --- a/dev-util/catkin/catkin-0.7.4.ebuild +++ b/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 index ada4a5e9254e..c98407801d62 100644 --- 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 new file mode 100644 index 000000000000..205aca92b62a --- /dev/null +++ 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) |