Subject: Re: bug#25690: make install-html broken

From: Assaf Gordon <[email-masked]>
Date: Thu, 16 Feb 2017 23:21:23 +0000

Hello Eric and all,

On Thu, Feb 16, 2017 at 09:29:42AM -0600, Eric Blake wrote:
>But until the new gettext release is widely available prior to the
>creation of tarballs, the gnulib hack is at least useful for creating
>working tarballs with an older gettext installed.
>

I just noticed that sed's 'bootstrap.conf' already patches 
po/Makefile.in.in (and coreutils' too).

So there's already a Right Place to do so :)

How about the following patch (perhaps for coreutils as well) ?

regards,
 - assaf

>From 780f966723d07c2990540d927402f03bb4b24031 Mon Sep 17 00:00:00 2001
From: Assaf Gordon <[email-masked]>
Date: Thu, 16 Feb 2017 18:11:54 -0500
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.
Report and suggested fix by Eric Blake in https://debbugs.gnu.org/25690 .

* bootstrap.conf (bootstrap_epilogue): Add 'install-{html,pdf,dvi,ps}'
  targets to po/Makefile.in.in (if needed).
---
 bootstrap.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bootstrap.conf b/bootstrap.conf
index 99df71e..e86a4c0 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -124,4 +124,12 @@ bootstrap_epilogue()
   # first grep may well run out of memory.
   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 '\ninstall-dvi install-ps install-pdf install-html:\n\n' >> \
+      po/Makefile.in.in
+  fi
 }
-- 
1.9.0