diff options
-rw-r--r-- | 0001-Add-DESTDIR-support.patch | 59 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 74 insertions, 5 deletions
diff --git a/0001-Add-DESTDIR-support.patch b/0001-Add-DESTDIR-support.patch new file mode 100644 index 000000000000..97f18abfc8f1 --- /dev/null +++ b/0001-Add-DESTDIR-support.patch @@ -0,0 +1,59 @@ +diff --git a/dune-install.sh b/dune-install.sh +index 9c44f689..1560c222 100755 +--- a/dune-install.sh ++++ b/dune-install.sh +@@ -15,7 +15,7 @@ then + fi + + readonly prefix="${1}" +-readonly libdir="${prefix}/share/herdtools7" ++readonly libdir="${DESTDIR}/${prefix}/share/herdtools7" + + . ./defs.sh + +diff --git a/dune-uninstall.sh b/dune-uninstall.sh +index d0802e97..52962340 100755 +--- a/dune-uninstall.sh ++++ b/dune-uninstall.sh +@@ -17,7 +17,7 @@ fi + readonly prefix="${1}" + + readonly bindir="${prefix}/bin" +-readonly libdir="${prefix}/share/herdtools7" ++readonly libdir="${DESTDIR}/${prefix}/share/herdtools7" + + # Print out the commands that this script runs. + set -x +diff --git a/ocb-install.sh b/ocb-install.sh +index d9740477..b22227c5 100755 +--- a/ocb-install.sh ++++ b/ocb-install.sh +@@ -18,8 +18,8 @@ readonly prefix="${1}" + + . ./defs.sh + +-readonly bindir="${prefix}/bin" +-readonly libdir="${prefix}/share/herdtools7" ++readonly bindir="${DESTDIR}/${prefix}/bin" ++readonly libdir="${DESTDIR}/${prefix}/share/herdtools7" + + mkdir -p "${bindir}" + mkdir -p "${libdir}" +diff --git a/ocb-uninstall.sh b/ocb-uninstall.sh +index 37dc09b3..343a4274 100755 +--- a/ocb-uninstall.sh ++++ b/ocb-uninstall.sh +@@ -18,8 +18,8 @@ readonly prefix="${1}" + + . ./defs.sh + +-readonly bindir="${prefix}/bin" +-readonly libdir="${prefix}/share/herdtools7" ++readonly bindir="${DESTDIR}/${prefix}/bin" ++readonly libdir="${DESTDIR}/${prefix}/share/herdtools7" + + rmbin () { + execs="$1" +-- +2.34.1 + @@ -13,8 +13,14 @@ url='https://github.com/herd/herdtools7' license=('CeCILL-B') depends=('ocaml') makedepends=('git' 'make' 'dune' 'ocaml-menhir') -source=('git://github.com/herd/herdtools7') -sha256sums=('SKIP') +source=('git://github.com/herd/herdtools7' '0001-Add-DESTDIR-support.patch') +sha256sums=('SKIP' + 'f620292cd27f6183cb5029c87bf3e70ffafd3444d584055512e80a475f10f993') + +prepare() { + cd $srcdir/$_pkgbase + git apply $srcdir/0001-Add-DESTDIR-support.patch +} build() { cd $srcdir/$_pkgbase @@ -23,7 +29,7 @@ build() { check() { cd $srcdir/$_pkgbase - make test + make test PREFIX="/usr" } pkgver() { @@ -35,6 +41,10 @@ pkgver() { } package() { - make -C $srcdir/$_pkgbase PREFIX="$pkgdir/usr" install -} + mkdir -p "$pkgdir/usr/share/doc" + # Add a shim for /usr/doc, because dune installs it wrong + ln -s "$pkgdir/usr/share/doc" "$pkgdir/usr/doc" + DESTDIR="$pkgdir" make -C $srcdir/$_pkgbase PREFIX="usr" install + rm "$pkgdir/usr/doc" +} |