diff templates/cmake.sh @ 13:6639623adb59

vanilla: simplify packages
author David Demelier <markand@malikania.fr>
date Fri, 22 Feb 2019 19:36:06 +0100
parents 3080f96acd07
children 9a1981080a45
line wrap: on
line diff
--- a/templates/cmake.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/templates/cmake.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,14 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./template.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./template.info
 
 case $(uname -m) in
 x86_64)
@@ -36,21 +29,19 @@
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.gz
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+pushd $PKGNAME-$PKGVERSION
 
-mkdir build && cd build
+mkdir build && pushd build
 cmake .. \
 	-DCMAKE_C_FLAGS="$CFLAGS" \
 	-DCMAKE_CXX_FLAGS="$CFLAGS" \
 	-DCMAKE_INSTALL_PREFIX=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
+popd
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION