diff options
| -rw-r--r-- | gnu/packages/linux.scm | 15 | ||||
| -rw-r--r-- | guix/build-system/linux-module.scm | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5dde319361..6d2aa89d35 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -816,6 +816,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (version version) (source source) (supported-systems supported-systems) + (outputs `("out" ,@(if build-doc? '("doc") '()))) (build-system gnu-build-system) (arguments (list @@ -842,10 +843,16 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (invoke "make" "infodocs"))) (add-after 'build-doc 'install-doc (lambda _ - (with-directory-excursion "Documentation/output" - (invoke "make" "-C" "texinfo" "install-info" - (string-append "infodir=" #$output - "/share/info")))))) + (let* ((info-dir (string-append #$output:doc + "/share/info")) + (info (string-append + info-dir "/TheLinuxKernel.info.gz"))) + (with-directory-excursion "Documentation/output" + (invoke "make" "-C" "texinfo" "install-info" + (string-append "infodir=" info-dir))) + ;; Create a symlink, for convenience. + (symlink info (string-append info-dir + "/linux.info.gz")))))) #~()) (add-before 'configure 'set-environment (lambda* (#:key target #:allow-other-keys) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index c1ddeaea10..29c3485023 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -59,6 +59,7 @@ (name (string-append (package-name linux) "-module-builder")) (inputs `(("linux" ,linux))) + (outputs (delete "doc" (package-outputs linux))) (arguments (substitute-keyword-arguments (package-arguments linux) ((#:phases phases) |