From aeeb23853a5569cc6ef9279a58a6b0b60034cba9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Jul 2017 14:13:18 +0300 Subject: [PATCH] stdenv: Don't move info pages to the 'man' output Because if you were to disable man pages via 'programs.man.enable', the "man" output wouldn't be installed and the info pages would go missing. --- doc/multiple-output.xml | 2 +- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a9151b2da3e..a2acc91e55a 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -83,7 +83,7 @@ $outputInfo - is for info pages. They go to info or $outputMan by default. + is for info pages. They go to info or $outputBin by default. diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index ddd1eafb4f9..60d4ccf99ed 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -42,7 +42,7 @@ _overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "$outputBin" _overrideFirst outputDevman "devman" "devdoc" "$outputMan" -_overrideFirst outputInfo "info" "$outputMan" +_overrideFirst outputInfo "info" "$outputBin" # Add standard flags to put files into the desired outputs.