diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-24 17:28:11 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-24 17:28:11 +0200 |
| commit | c57d649de380da890f296428b85564cbc527bbad (patch) | |
| tree | 79e9c0b5407aea91c421f7004a0da7bb1e207ba4 /doc/local.mk | |
| parent | 69c2e0103ab64aa6e0beb7651797de9cfd22a6d7 (diff) | |
| parent | 9b42918edd3f7e9d505c874d3947c0a0815fe551 (diff) | |
| download | patches-c57d649de380da890f296428b85564cbc527bbad.tar patches-c57d649de380da890f296428b85564cbc527bbad.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc/local.mk')
| -rw-r--r-- | doc/local.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/local.mk b/doc/local.mk index 30c4a8c34d..f8709bb3a4 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2016 Eric Bavier <bavier@member.fsf.org> -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org> @@ -185,6 +185,7 @@ sub_commands_mans = \ $(srcdir)/%D%/guix-archive.1 \ $(srcdir)/%D%/guix-build.1 \ $(srcdir)/%D%/guix-challenge.1 \ + $(srcdir)/%D%/guix-deploy.1 \ $(srcdir)/%D%/guix-download.1 \ $(srcdir)/%D%/guix-edit.1 \ $(srcdir)/%D%/guix-environment.1 \ @@ -197,12 +198,19 @@ sub_commands_mans = \ $(srcdir)/%D%/guix-pull.1 \ $(srcdir)/%D%/guix-refresh.1 \ $(srcdir)/%D%/guix-size.1 \ - $(srcdir)/%D%/guix-system.1 + $(srcdir)/%D%/guix-system.1 \ + $(srcdir)/%D%/guix-time-machine.1 \ + $(srcdir)/%D%/guix-weather.1 + +# Assume that cross-compiled commands cannot be executed. +if !CROSS_COMPILING dist_man1_MANS = \ $(srcdir)/%D%/guix.1 \ $(sub_commands_mans) +endif + gen_man = \ LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN) \ $(HELP2MANFLAGS) @@ -224,10 +232,12 @@ $(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS) esac if BUILD_DAEMON +if !CROSS_COMPILING dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1 -$(srcdir)/%D%/guix-daemon.1: nix/nix-daemon/guix-daemon.cc +$(srcdir)/%D%/guix-daemon.1: guix-daemon$(EXEEXT) -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1` endif +endif |