From 4fb254a3399a62b061fdde365fc8d53d6a6fc23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 9 Sep 2015 18:17:38 +0200 Subject: [PATCH] gnu: openssl: Install data and documentation to PREFIX/share. * gnu/packages/tls.scm (openssl)[arguments]: Add 'fix-man-dir' phase. Pass --openssldir=PREFIX/share/openssl-VERSION to ./config. --- gnu/packages/tls.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5bbe367286..0bce6e1bc7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -204,6 +204,15 @@ required structures.") #:test-target "test" #:phases (modify-phases %standard-phases + (add-before + 'configure 'fix-man-dir + (lambda* (#:key outputs #:allow-other-keys) + ;; The default MANDIR is some unusual place. Fix that. + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile.org" + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/share/man\n"))) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -212,6 +221,13 @@ required structures.") (system* "./config" "shared" ;build shared libraries "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + (string-append "--prefix=" out) ;; XXX FIXME: Work around a code generation bug in GCC