[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/96] gnu: camlp4: Install camlp4 META file.
From: |
Julien Lepiller |
Subject: |
[PATCH 07/96] gnu: camlp4: Install camlp4 META file. |
Date: |
Tue, 3 Jan 2017 20:10:48 +0100 |
* gnu/packages/ocaml.scm (ocaml-findlib): Delete camlp4 META file.
* gnu/packages/ocaml.scm (camlp4): Install in OCAMLPATH and install its META
file.
---
gnu/packages/ocaml.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6bb0e4826..7d9d363b5 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -258,9 +258,19 @@ Git-friendly development workflow.")
;; This is a home-made 'configure' script.
(let ((out (assoc-ref outputs "out")))
(zero? (system* "./configure"
- (string-append "--libdir=" out "/lib")
+ (string-append "--libdir=" out
+ "/lib/ocaml/site-lib")
(string-append "--bindir=" out "/bin")
- (string-append "--pkgdir=" out)))))))))
+ (string-append "--pkgdir=" out
+
"/lib/ocaml/site-lib"))))))
+ (add-after 'install 'install-meta
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "camlp4/META.in"
+ (("directory = .*")
+ (string-append "directory = \"" out
+ "/lib/ocaml/site-lib/camlp4\"\n")))
+ (zero? (system* "make" "install-META"))))))))
(home-page "https://github.com/ocaml/camlp4")
(synopsis "Write parsers in OCaml")
(description
@@ -725,7 +735,12 @@ to the other.")
"-config" (string-append out "/etc/ocamfind.conf")
"-mandir" (string-append out "/share/man")
"-sitelib" (string-append out "/lib/ocaml/site-lib")
- "-with-toolbox")))))))
+ "-with-toolbox"))))
+ (add-after 'install 'remove-camlp4
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (delete-file-recursively
+ (string-append out
"/lib/ocaml/site-lib/camlp4"))))))))
(home-page "http://projects.camlcity.org/projects/findlib.html")
(synopsis "Management tool for OCaml libraries")
(description
--
2.11.0
- [PATCH 00/96] ocaml-build-system and packages, Julien Lepiller, 2017/01/03
- [PATCH 02/96] gnu: ocaml: Add CAML_LD_LIBRARY_PATH search-path, Julien Lepiller, 2017/01/03
- [PATCH 01/96] gnu: ocaml: Add a .file directive to generated .s files, Julien Lepiller, 2017/01/03
- [PATCH 03/96] gnu: camlp4: compile native, Julien Lepiller, 2017/01/03
- [PATCH 04/96] gnu: Add ocaml-build-system., Julien Lepiller, 2017/01/03
- [PATCH 05/96] gnu: ocaml: Use a prefix for license field., Julien Lepiller, 2017/01/03
- [PATCH 06/96] gnu: ocaml: Use a helper function to download from ocaml-forge., Julien Lepiller, 2017/01/03
- [PATCH 07/96] gnu: camlp4: Install camlp4 META file.,
Julien Lepiller <=
- [PATCH 08/96] gnu: Add ocaml-ounit., Julien Lepiller, 2017/01/03
- [PATCH 10/96] gnu: Add ocamlmod., Julien Lepiller, 2017/01/03
- Re: [PATCH 10/96] gnu: Add ocamlmod., David Craven, 2017/01/04
- Re: [PATCH 10/96] gnu: Add ocamlmod., julien lepiller, 2017/01/04
- Re: [PATCH 10/96] gnu: Add ocamlmod., David Craven, 2017/01/04
- Re: [PATCH 10/96] gnu: Add ocamlmod., David Craven, 2017/01/04
- Re: [PATCH 10/96] gnu: Add ocamlmod., David Craven, 2017/01/04
- Re: [PATCH 10/96] gnu: Add ocamlmod., Julien Lepiller, 2017/01/15
- Re: [PATCH 10/96] gnu: Add ocamlmod., David Craven, 2017/01/15