diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-21 04:57:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-21 05:02:52 -0400 |
| commit | c52872bfc418c6b2273f973dff8003ca9e062792 (patch) | |
| tree | 4184a250e6d8363b3901aa2abe6910ff08ce08d4 /Makefile.am | |
| parent | 65bb22796f854cbc3eae053a80b1d64365dad376 (diff) | |
| parent | 3fe49e50153fec1dabac35e262a0888044f79aa6 (diff) | |
| download | guix-c52872bfc418c6b2273f973dff8003ca9e062792.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4d59fde839..86528e8fdd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,7 @@ # Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> # Copyright © 2018 Nils Gillmann <ng0@n0.is> +# Copyright © 2018 Julien Lepiller <julien@lepiller.eu> # # This file is part of GNU Guix. # @@ -26,6 +27,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. +MSGMERGE_UPDATE = @MSGMERGE@ --update + bin_SCRIPTS = scripts/guix # Handle substitution of fully-expanded Autoconf variables. @@ -51,6 +54,7 @@ MODULES_NOT_COMPILED = \ guix/man-db.scm include gnu/local.mk +include po/doc/local.mk MODULES = \ guix/base16.scm \ @@ -454,7 +458,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish # SELinux policy dist_selinux_policy_DATA = etc/guix-daemon.cil -EXTRA_DIST = \ +EXTRA_DIST += \ HACKING \ ROADMAP \ TODO \ @@ -792,3 +796,7 @@ AM_V_DOT_0 = @echo " DOT " $@; AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V)) AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY)) AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; + +AM_V_PO4A = $(AM_V_PO4A_$(V)) +AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) +AM_V_PO4A_0 = @echo " PO4A" $@; |