Fix copying

2 files changed, 8 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 309c2bfbb4c7..8172381cdffa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fstar-ulib
 	pkgdesc = compiles the ulib component of F*
 	pkgver = 0.9.6.0
-	pkgrel = 8
+	pkgrel = 9
 	url = https://www.fstar-lang.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e7dcbd397bed..8d92fb455e59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=fstar-ulib
 pkgver=0.9.6.0
-pkgrel=8
+pkgrel=9
 pkgdesc="compiles the ulib component of F*"
 arch=('i686' 'x86_64')
 url='https://www.fstar-lang.org/'
@@ -14,12 +14,15 @@ build() {
   cd "$srcdir/"
   cp -r /opt/fstar/ .
   export FSTAR_HOME="$(pwd)/fstar"
-  cd fstar/ulib/ml
+  cd fstar/ulib
+  make clean
+  cd ml
+  make clean
   make -j4
 }
 
 package() {
   cd "$srcdir/"
-  mkdir -p "$pkgdir/opt/fstar/"
-  find fstar/ulib -type f -exec sh -c "find /opt/fstar/ulib | grep -q '{}$' || cp -r {} $pkgdir/opt/fstar" \;
+  mkdir -p "$pkgdir/opt/fstar/ulib"
+  find fstar/ulib -type f -exec sh -c "pacman -Ql fstar | cut -f 2 -d ' ' | grep -q '{}$' || cp -r {} '$pkgdir/opt/fstar/ulib'" \;
 }