fix tar_from_installation.sh and dist target

.gitignore

@@ -1 +1,2 @@
 build
+dist

Makefile

@@ -193,7 +193,7 @@ package: build/package.BUILT
 build/package.BUILT: build strip
 	mkdir -p dist
 	command -v dpkg-deb >/dev/null && ./deb_from_installation.sh $(shell pwd)/dist || true
-	./tar_from_installation.sh $(shell pwd)/dist
+	./tar_from_installation.sh "$(shell pwd)/dist" "$(VERSION)" "$(PATH_PREFIX)"
 	touch build/package.BUILT
 
 .PHONY: default clean build strip package check

tar_from_installation.sh

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 set -ex
+OUTDIR=$PWD/dist
+VERSION=`./version.sh`
+INDIR=/opt/wasi-sdk
+
 if [ -n "$1" ]; then
     OUTDIR=$1
-else
-    OUTDIR=$PWD/dist
 fi
 
 if [ -n "$2" ]; then
     VERSION="$2"
-else
+fi
-    VERSION=`./version.sh`
+
+if [ -n "$3" ]; then
+    INDIR="$3"
 fi
 
 PKGDIR=build/wasi-sdk-$VERSION
@@ -23,7 +27,7 @@ case "$(uname -s)" in
 esac
 
 rm -rf $PKGDIR
-cp -R /opt/wasi-sdk $PKGDIR
+cp -R $INDIR $PKGDIR
 cd build
 tar czf $OUTDIR/wasi-sdk-$VERSION\-$MACHINE.tar.gz wasi-sdk-$VERSION