summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-05-30 19:04:57 +0000
committerJustin Lecher <jlec@gentoo.org>2012-05-30 19:04:57 +0000
commiteae2bdcad6046e892ea9eca526b2ef21a498b58e (patch)
treecbab9ea0b709bb482fb675d2d760acf792b284ce /sci-libs/neartree
parentsci-libs/arpack: dev-util/pkgconfig -> virtual/pkgconfig (diff)
downloadgentoo-2-eae2bdcad6046e892ea9eca526b2ef21a498b58e.tar.gz
gentoo-2-eae2bdcad6046e892ea9eca526b2ef21a498b58e.tar.bz2
gentoo-2-eae2bdcad6046e892ea9eca526b2ef21a498b58e.zip
sci-libs/neartree: Don't install into /usr/usr/lib
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/neartree')
-rw-r--r--sci-libs/neartree/ChangeLog8
-rw-r--r--sci-libs/neartree/files/CMakeLists.txt2
-rw-r--r--sci-libs/neartree/neartree-3.1.1-r2.ebuild (renamed from sci-libs/neartree/neartree-3.1.1-r1.ebuild)2
3 files changed, 9 insertions, 3 deletions
diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index ec5afd79d9e3..01fc1f36bec8 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/neartree
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.20 2012/05/30 12:34:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.21 2012/05/30 19:04:57 jlec Exp $
+
+*neartree-3.1.1-r2 (30 May 2012)
+
+ 30 May 2012; Justin Lecher <jlec@gentoo.org> -neartree-3.1.1-r1.ebuild,
+ +neartree-3.1.1-r2.ebuild, files/CMakeLists.txt:
+ Don't install into /usr/usr/lib
*neartree-3.1.1-r1 (30 May 2012)
diff --git a/sci-libs/neartree/files/CMakeLists.txt b/sci-libs/neartree/files/CMakeLists.txt
index 4d2f07eab958..fe112be9a4d4 100644
--- a/sci-libs/neartree/files/CMakeLists.txt
+++ b/sci-libs/neartree/files/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(CNearTree CVector m)
set_target_properties(CNearTree PROPERTIES SOVERSION ${LIB_MAJOR} VERSION ${_soversion})
-INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
install(FILES CNearTree.h rhrand.h TNear.h triple.h
DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
install(FILES README_NearTree.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/neartree-${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
diff --git a/sci-libs/neartree/neartree-3.1.1-r1.ebuild b/sci-libs/neartree/neartree-3.1.1-r2.ebuild
index 030c5e59630f..c38190ed5e06 100644
--- a/sci-libs/neartree/neartree-3.1.1-r1.ebuild
+++ b/sci-libs/neartree/neartree-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1-r1.ebuild,v 1.1 2012/05/30 12:34:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1-r2.ebuild,v 1.1 2012/05/30 19:04:57 jlec Exp $
EAPI=4