--- a/lib/libcddb/libcddb.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/lib/libcddb/libcddb.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,38 +15,26 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./libcddb.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./libcddb.info
 
 case $(uname -m) in
 x86_64)
-	ARCH="amd64"
 	CFLAGS="-O2 -fPIC"
 	;;
 *)
-	ARCH="$(uname -m)"
 	CFLAGS="-O2"
 	;;
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.bz2
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
+pushd $PKGNAME-$PKGVERSION
 
 CFLAGS="$CFLAGS" ./configure --prefix=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION