Only use files from fstar package

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e6489b90f8a..21ed95cafbbb 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 = 14
+	pkgrel = 15
 	url = https://www.fstar-lang.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b33d7bab51ec..df1a9babcf20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=fstar-ulib
 pkgver=0.9.6.0
-pkgrel=14
+pkgrel=15
 pkgdesc="compiles the ulib component of F*"
 arch=('i686' 'x86_64')
 url='https://www.fstar-lang.org/'
@@ -13,18 +13,23 @@ depends=('fstar' 'z3' 'ocaml-fstar')
 build() {
   cd "$srcdir/"
   rm -rf fstar
-  cp -r /opt/fstar/ .
-  export FSTAR_HOME="$(pwd)/fstar"
+  pacman -Ql fstar | cut -f 2 -d ' ' | while read f; do
+    if [ -f "$f" ]; then
+      mkdir -p "$(dirname ".$f")"
+      cp "$f" ".$f"
+    fi
+  done
+  export FSTAR_HOME="$(pwd)/opt/fstar"
   export PATH="$PATH:$FSTAR_HOME/bin"
-  cd fstar/ulib/ml
+  cd opt/fstar/ulib/ml
   make -j4
 }
 
 package() {
   cd "$srcdir/"
   mkdir -p "$pkgdir/opt/fstar/ulib"
-  find fstar/ -type f | while read f; do
-    mkdir -p "$(dirname "$pkgdir/opt/$f")"
-    pacman -Ql fstar | cut -f 2 -d ' ' | grep -qF "/opt/$f" || cp "$f" "$pkgdir/opt/$f"
+  find opt/fstar/ -type f | while read f; do
+    mkdir -p "$(dirname "$pkgdir/$f")"
+    pacman -Ql fstar | cut -f 2 -d ' ' | grep -qF "/$f" || cp "$f" "$pkgdir/opt/$f"
   done
 }