diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-10-21 19:37:24 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-10-21 19:37:24 +0000 |
| commit | 59d0f626906a6d7a234eefb946a2677dacdb5d90 (patch) | |
| tree | d97e017664543127f55cca78aee34e87a3199701 | |
| parent | 34c0896e81b73d66a19fb4b57d4982f023c9268a (diff) | |
| download | asb-59d0f626906a6d7a234eefb946a2677dacdb5d90.tar.gz asb-59d0f626906a6d7a234eefb946a2677dacdb5d90.tar.xz | |
inkscape: fix detection of the dynamic library which gets installed into a subdirectory. Remove useless cruft.
| -rwxr-xr-x | inkscape/build/inkscape.SlackBuild | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inkscape/build/inkscape.SlackBuild b/inkscape/build/inkscape.SlackBuild index cc60ac98..479e3ee8 100755 --- a/inkscape/build/inkscape.SlackBuild +++ b/inkscape/build/inkscape.SlackBuild @@ -169,15 +169,11 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DBUILD_SHARED_LIBS=ON \ -DWITH_DBUS=ON \ -DWITH_GRAPHICS_MAGICK=ON \ @@ -187,6 +183,10 @@ cd build-${PRGNAM} make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log cd - +# Irrelevant pkgconfig file with wrong library path on 64bit also: +rm -rf $PKG/usr/lib/pkgconfig +rmdir $PKG/usr/lib || true + # Add this to the doinst.sh: mkdir -p $PKG/install cat <<EOINS >> $PKG/install/doinst.sh |