diff options
| -rwxr-xr-x | digikam/build/digikam.SlackBuild | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/digikam/build/digikam.SlackBuild b/digikam/build/digikam.SlackBuild index d1af2759..cba4e59d 100755 --- a/digikam/build/digikam.SlackBuild +++ b/digikam/build/digikam.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007-2009 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007-2009 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -60,8 +60,6 @@ TAG=${TAG:-alien} DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README RELEASE.rev TODO" -KDEPREF=$(kde-config --prefix) - # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -148,19 +146,21 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . echo Building ... +KDECONFIG=$( which kde4-config 1>/dev/null 2>&1 && echo "kde4-config" || echo "kde-config" ) + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \ -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${KDEPREF} \ + -DCMAKE_INSTALL_PREFIX=$($KDECONFIG --prefix) \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=/usr/lib$($KDECONFIG --libsuffix) \ .. -make 2>&1 |tee $OUTPUT/make-${PRGNAM}.log -make install DESTDIR=${PKG} 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + make 2>&1 |tee $OUTPUT/make-${PRGNAM}.log + make install DESTDIR=${PKG} 2>&1 |tee $OUTPUT/install-${PRGNAM}.log cd .. # Update the desktop menus after install: @@ -187,7 +187,7 @@ fi # Strip binaries: find ${PKG} | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Add a package description: mkdir -p $PKG/install |