From 6fc3ef9e6fe62871ec3cdf25f35295fd35bf6fc7 Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Wed, 8 Mar 2017 00:54:31 +0000 Subject: [PATCH] build: fix 'install-html' target Switching to non-recursive makefiles broke the 'install-html' target: The gettext plumbing requires an 'install-html' target in po/Makefile. This was fixed in gettext v0.19.8.1-41-ge5a008a, but packages using older gettext need to manually patch po/Makefile.in.in. Reported (for 'sed') and suggested fix by Eric Blake in https://bugs.gnu.org/25690 . * bootstrap.conf (bootstrap_epilogue): Add 'install-{html,pdf,dvi,ps}' targets to po/Makefile.in.in (if needed). --- bootstrap.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bootstrap.conf b/bootstrap.conf index dd93c08aa6..7def1f99a6 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -376,6 +376,13 @@ bootstrap_epilogue() perl -pi -e 's/if LC_ALL=C grep .GNU .PACKAGE.*; then/if true; then/' \ po/Makefile.in.in + # Add dummy 'install-html' target, required for packages using + # non-recursive makefiles with older gettext. + # See https://debbugs.gnu.org/25690 + if ! grep -w 'install-html' po/Makefile.in.in ; then + printf 'install-%s:;\n' dvi ps pdf html >> po/Makefile.in.in + fi + # Install our git hooks, as long as "cp" accepts the --backup option, # so that we can back up any existing files. case $(cp --help) in *--backup*) backup=1;; *) backup=0;; esac -- 2.47.2