From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: [PATCH 07/96] gnu: camlp4: Install camlp4 META file. Date: Tue, 3 Jan 2017 20:10:48 +0100 Message-ID: <20170103191217.6431-8-julien@lepiller.eu> References: <20170103191217.6431-1-julien@lepiller.eu> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOUW3-0007TL-Tq for guix-devel@gnu.org; Tue, 03 Jan 2017 14:13:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOUW2-0004XT-Lf for guix-devel@gnu.org; Tue, 03 Jan 2017 14:12:59 -0500 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:35264 helo=skaro.lepiller.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOUW2-0004Wh-9p for guix-devel@gnu.org; Tue, 03 Jan 2017 14:12:58 -0500 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id C0CC781267 for ; Tue, 3 Jan 2017 20:12:55 +0100 (CET) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NjjkgAQT2tER for ; Tue, 3 Jan 2017 20:12:46 +0100 (CET) Received: from localhost.localdomain (128-79-116-134.hfc.dyn.abo.bbox.fr [128.79.116.134]) by skaro.lepiller.eu (Postfix) with ESMTPSA id BF4E0811E5 for ; Tue, 3 Jan 2017 20:12:31 +0100 (CET) In-Reply-To: <20170103191217.6431-1-julien@lepiller.eu> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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