stk: fix ftbfs, reconfigure libexecdir

We installed those files into /usr/libexec/stk for a long time.
This commit is contained in:
Đoàn Trần Công Danh 2021-01-18 20:43:00 +07:00 committed by Jürgen Buchmüller
parent 524253bd00
commit 9de6a9e7fb
2 changed files with 26 additions and 7 deletions

View file

@ -0,0 +1,21 @@
--- src/Makefile.in.orig 2021-01-18 20:34:19.338872822 +0700
+++ src/Makefile.in 2021-01-18 20:35:11.314028147 +0700
@@ -93,13 +93,13 @@
$(LN) -s @sharedname@ $(SHAREDLIB)
install-headers:
- install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
- cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+ install -d $(DESTDIR)$(INCLUDEDIR)/stk
+ cp -R ../include/*.h $(DESTDIR)$(INCLUDEDIR)/stk
install: $(SHAREDLIB) install-headers
- install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
- install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
- ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
+ install -d $(DESTDIR)$(LIBDIR)
+ install -m 644 @sharedname@ $(DESTDIR)$(LIBDIR)
+ ln -sf @sharedname@ $(DESTDIR)$(LIBDIR)/$(SHAREDLIB)
$(OBJECTS) : Stk.h

View file

@ -1,9 +1,12 @@
# Template file for 'stk'
pkgname=stk
version=4.6.1
revision=4
revision=5
build_style=gnu-configure
configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
configure_args="--with-alsa
--libexecdir=/usr/libexec/stk
--with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
make_install_args="prefix=/usr"
hostmakedepends="automake libtool pkg-config"
makedepends="alsa-lib-devel jack-devel"
depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
@ -19,11 +22,6 @@ pre_configure() {
}
post_install() {
# Fix wrong 32 bit library install path
if [ -f "${DESTDIR}"/usr/usr/lib32/libstk.so ]; then
mv -v "${DESTDIR}"/usr/usr/lib32/* "${DESTDIR}"/usr/lib
fi
# Create a pkg-config file
vmkdir usr/lib/pkgconfig
sed ${FILESDIR}/stk.pc \