From 3b165f2a401a6f890f5f93371bdf137daf09c493 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 16 Aug 2019 18:36:50 +0200 Subject: [PATCH] gnu: wpa-supplicant: install documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (wpa-supplicant)[arguments]: Rename 'install-man-pages' phase to 'install-documentation'; install READMEs and the example config file. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bd3c14033e..979b901c1a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1240,9 +1240,10 @@ (define-public wpa-supplicant-minimal CONFIG_READLINE=y\n" port) (close-port port)) #t)) - (add-after 'install 'install-man-pages + (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/wpa-supplicant")) (man (string-append out "/share/man")) (man5 (string-append man "/man5")) (man8 (string-append man "/man8"))) @@ -1255,6 +1256,15 @@ (define (copy-man-page target) (find-files "doc/docbook" "\\.5")) (for-each (copy-man-page man8) (find-files "doc/docbook" "\\.8")) + + ;; wpa_supplicant.conf(5) does not explain all configuration + ;; options but refers to the example config file, so install it + ;; along with READMEs. + (for-each (lambda (file) + (install-file file doc)) + '("README" "README-DPP" "README-HS20" + "README-P2P" "README-WPS" + "wpa_supplicant.conf")) #t)))) #:make-flags (list "CC=gcc" @@ -1303,7 +1313,7 @@ (define-public wpa-supplicant CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) (close-port port)) #t)) - (add-after 'install-man-pages 'install-dbus-conf + (add-after 'install-documentation 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dir (string-append out "/etc/dbus-1/system.d")))