From 1623a9774067d2d834d8fde32165b61489eac359 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 16 Apr 2013 14:39:52 +0200 Subject: [PATCH] ocaml: fix installation. --- srcpkgs/ocaml/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index f8bbc5f1d1..38beb9b294 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -34,9 +34,16 @@ do_build() { } do_install() { + local compiler_libs=${DESTDIR}/usr/lib/ocaml/compiler-libs + make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install vinstall LICENSE 644 usr/share/licenses/${pkgname} + + mkdir -pv "${compiler_libs}"/{parsing,typing,utils} + cp -v parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "${compiler_libs}"/parsing + cp -v typing/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/typing + cp -v utils/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/utils } @@ -44,15 +51,9 @@ ocaml-compiler-libs_package() { depends="ocaml-${version}" short_desc+=" -- shared libraries" pkg_install() { - local compiler_libs="${PKGDESTDIR}/usr/lib/ocaml/compiler-libs" - - mkdir -pv "${compiler_libs}"/{parsing,typing,utils} - cp -v parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "${compiler_libs}"/parsing - cp -v typing/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/typing - cp -v utils/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/utils - rm -f "${compiler_libs}"/typing/outcometree.{cmi,mli} - + vmove usr/lib/ocaml/compiler-libs vinstall ${wrksrc}/LICENSE 644 usr/share/licenses/${pkgname} + rm -f ${PKGDESTDIR}/usr/lib/ocaml/compiler-libs/typing/outcometree.{cmi,mli} } }