From eb923fe2d5e38184340695089a80e2e46e8f6797 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 28 Dec 2021 10:03:53 +0100
Subject: [PATCH] Fix --automake-subdir breakage (regression 2021-12-24).

Reported by Bjarni Ingi Gislason <bjarniig@rhi.hi.is> in
<https://lists.gnu.org/archive/html/bug-gnulib/2021-12/msg00156.html>.

* build-aux/prefix-gnulib-mk (prefix_assignment): Don't change
SED_HEADER_* variables.
---
 ChangeLog                  | 8 ++++++++
 build-aux/prefix-gnulib-mk | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d748e88148..7402d0ca4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-12-28  Bruno Haible  <bruno@clisp.org>
+
+	Fix --automake-subdir breakage (regression 2021-12-24).
+	Reported by Bjarni Ingi Gislason <bjarniig@rhi.hi.is> in
+	<https://lists.gnu.org/archive/html/bug-gnulib/2021-12/msg00156.html>.
+	* build-aux/prefix-gnulib-mk (prefix_assignment): Don't change
+	SED_HEADER_* variables.
+
 2021-12-26  Bruno Haible  <bruno@clisp.org>
 
 	Update to Unicode 10.0.0.
diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk
index 4f300c4433..3763d6e850 100755
--- a/build-aux/prefix-gnulib-mk
+++ b/build-aux/prefix-gnulib-mk
@@ -133,8 +133,8 @@ sub prefix_assignment ($$)
     {
       # Do not change the RHS, which specifies the GPERF program.
     }
-  # Don't change variables such as HAVE_INCLUDE_NEXT.
-  elsif ($lhs_and_assign_op =~ /^HAVE_/)
+  # Don't change variables such as HAVE_INCLUDE_NEXT or SED_HEADER_STDOUT.
+  elsif ($lhs_and_assign_op =~ /^(HAVE_|SED_HEADER_)/)
     {
     }
   elsif ($lhs_and_assign_op =~
-- 
2.39.5