From 98b1464bdf6306a8ab4614b5e9f76cdb2dd00b33 Mon Sep 17 00:00:00 2001 From: Alexey Izbyshev Date: Wed, 2 Oct 2024 22:58:08 +0300 Subject: [PATCH] bfd: fix unnecessary bfd.info regen When building from an unmodified release tarball, a REGEN_TEXI invocation is supposed to create a symlink to the .texi file in the source directory and discard the newly generated .tmp file. However, after commit bd32be01c997 ("bfd: merge doc subdir up a level") it creates the symlink at the wrong level, and then a .texi with a fresh timestamp, which in turn forces bfd.info regeneration. This breaks builds in environments without makeinfo program. Fix this by creating the symlink at the level of the target stamp. Fixes: bd32be01c997 ("bfd: merge doc subdir up a level") Signed-off-by: Alexey Izbyshev --- bfd/Makefile.in | 2 +- bfd/doc/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index b3d97d478ea..e9b479a8bdc 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1322,7 +1322,7 @@ REGEN_TEXI = \ $(MKDOC) -f $(srcdir)/doc/doc.str < $< > $@.tmp; \ texi=$@; \ texi=$${texi%.stamp}.texi; \ - test -e $$texi || test ! -f $(srcdir)/$$texi || $(LN_S) $(srcdir)/$$texi .; \ + test -e $$texi || test ! -f $(srcdir)/$$texi || $(LN_S) $(srcdir)/$$texi $$texi; \ $(SHELL) $(srcdir)/../move-if-change $@.tmp $$texi; \ touch $@; \ ) diff --git a/bfd/doc/local.mk b/bfd/doc/local.mk index 5e8f486f200..9767e583f18 100644 --- a/bfd/doc/local.mk +++ b/bfd/doc/local.mk @@ -101,7 +101,7 @@ REGEN_TEXI = \ $(MKDOC) -f $(srcdir)/%D%/doc.str < $< > $@.tmp; \ texi=$@; \ texi=$${texi%.stamp}.texi; \ - test -e $$texi || test ! -f $(srcdir)/$$texi || $(LN_S) $(srcdir)/$$texi .; \ + test -e $$texi || test ! -f $(srcdir)/$$texi || $(LN_S) $(srcdir)/$$texi $$texi; \ $(SHELL) $(srcdir)/../move-if-change $@.tmp $$texi; \ touch $@; \ ) -- 2.47.2