From ed240a7ab563b812a96d823244fb023ce01a61a3 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Thu, 24 Jul 2014 19:39:34 +0100 Subject: libraries/CGAL: Fix lib64 paths. The paths in delivered cmake files were wrong, so that other packages could not find CGAL on x86_64. The new upstream config variables mostly solve the problem. Thanks bosth! Signed-off-by: David Spencer --- libraries/CGAL/CGAL.SlackBuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libraries/CGAL') diff --git a/libraries/CGAL/CGAL.SlackBuild b/libraries/CGAL/CGAL.SlackBuild index 0e80ae0da88b..9099f139cd9f 100644 --- a/libraries/CGAL/CGAL.SlackBuild +++ b/libraries/CGAL/CGAL.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=CGAL VERSION=${VERSION:-4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -75,17 +75,18 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCGAL_INSTALL_LIB_DIR=lib${LIBDIRSUFFIX} \ + -DCGAL_INSTALL_CMAKE_DIR=lib${LIBDIRSUFFIX}/CGAL \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG cd .. -# Install path fixup: LIB_SUFFIX not supported -if [ "$LIBDIRSUFFIX" != '' ]; then - mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} -fi +# Path fixup: CGAL_INSTALL_CMAKE_DIR not fully honoured (thanks bosth!) +sed -i -e "s:/usr/lib/CGAL:/usr/lib${LIBDIRSUFFIX}/CGAL:" \ + $PKG/usr/lib${LIBDIRSUFFIX}/CGAL/FindCGAL.cmake -# Install path fixup: MAN_INSTALL_DIR not supported +# Path fixup: MAN_INSTALL_DIR not supported mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -- cgit v1.2.3