support global configuration directory (/usr/share/satysfi)

2 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fcad492adea..40513a89c10c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = satysfi-git
 	pkgdesc = A statically-typed, functional typesetting system
-	pkgver = r1306.baa8057
-	pkgrel = 2
+	pkgver = r1314.3e6d067
+	pkgrel = 1
 	url = https://github.com/gfngfn/SATySFi
 	arch = x86_64
 	license = LGPL3
@@ -13,6 +13,7 @@ pkgbase = satysfi-git
 	makedepends = wget
 	depends = glibc
 	provides = satysfi
+	conflicts = satysfi
 	source = git+https://github.com/gfngfn/SATySFi
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 221de1dcb929..19d0d952ae92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=satysfi-git
 _pkgname=SATySFi
-pkgver=r1306.baa8057
-pkgrel=2
+pkgver=r1314.3e6d067
+pkgrel=1
 pkgdesc="A statically-typed, functional typesetting system"
 arch=('x86_64')
 url="https://github.com/gfngfn/SATySFi"
@@ -11,6 +11,7 @@ license=('LGPL3')
 depends=('glibc')
 optdepends=()
 makedepends=('git' 'libx11' 'ocaml-findlib' 'opam' 'rsync' 'wget')
+conflicts=("satysfi")
 provides=("satysfi")
 options=()
 source=("git+https://github.com/gfngfn/${_pkgname}")
@@ -23,20 +24,20 @@ pkgver() {
 
 build() {
   cd "${_pkgname}"
-  git submodule update --init --recursive
   export OPAMROOT="${srcdir}/.opam"
-  opam init --yes --no-setup
+  export OPAMYES=1
+  opam init --no-setup
   eval "$(opam config env)"
+  opam pin add --no-action satysfi .
   # bypass "ERROR: Preinstalled ocamlbuild detected at ..."
   export CHECK_IF_PREINSTALLED=false
-  opam pin add --yes satysfi .
+  opam install --deps-only satysfi
+  make lib
+  make PREFIX=/usr
 }
 
 package() {
   cd "${_pkgname}"
-  export OPAMROOT="${srcdir}/.opam"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 "${OPAMROOT}/system/bin/satysfi" "${pkgdir}/usr/bin/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+  make install PREFIX="${pkgdir}/usr"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }