diff --git a/SysBuild/multimedia/ptlib b/SysBuild/multimedia/ptlib index dedf520..296fafb 100644 --- a/SysBuild/multimedia/ptlib +++ b/SysBuild/multimedia/ptlib @@ -116,7 +116,7 @@ mk32() { } mk() { - sed -i -e "s:/share/pwlib:/lib/pwlib:g" Makefile.in + sed -i -e "s:/share/pwlib:/${LIBDIR}/pwlib:g" Makefile.in CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ @@ -127,7 +127,7 @@ mk() { --enable-v4l2 \ --enable-alsa \ --enable-oss \ - --libdir=\${prefix}/${LIBDIR} \ + --libdir=/usr/${LIBDIR} \ --prefix=/usr touch $TARGET unset TARGET @@ -141,8 +141,7 @@ postmk() { tar -C $TMPROOT/usr/lib -cf - .| tar -C $TMPROOT/usr/lib64 -xvf - rm -r $TMPROOT/usr/lib mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib - rm $TMPROOT/usr/bin/ptlib-config - ln -sf ../lib64/pwlib/make/ptlib-config $TMPROOT/usr/bin/ptlib-config-64 + mv $TMPROOT/usr/bin/ptlib-config{,-64} ln -sf multiarch_wrapper $TMPROOT/usr/bin/ptlib-config mv -v $TMPROOT/usr/include/ptbuildopts{,-64}.h cat > $TMPROOT/usr/include/ptbuildopts.h << "EOF"