[COMMITTED] config/Makefile.am: Modify profile.fish in all-local

Aaron Merey amerey@redhat.com
Fri May 10 22:00:05 GMT 2024


Fish shell scripts do not support bracketed variables.
config/Makefile.am removes brackets from a variable in
config/fish.profile in order to prevent an error when running the
script.

Currently the brackets are removed during make install.  This causes
testsuite failures if make check is run before make install.

Fix this by removing the brackets in all-local instead of
install-data-local.

Signed-off-by: Aaron Merey <amerey@redhat.com>
---
 config/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index e42aacee..2dcbe94e 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -38,10 +38,12 @@ pkgconfig_DATA = libelf.pc libdw.pc
 if LIBDEBUGINFOD
 pkgconfig_DATA += libdebuginfod.pc
 
+all-local:
+	sed -i 's/{prefix}/prefix/g' profile.fish
+
 install-data-local:
 	$(INSTALL_DATA) profile.sh -D $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.sh
 	$(INSTALL_DATA) profile.csh -D $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.csh
-	sed -i 's/{prefix}/prefix/g' profile.fish
 	$(INSTALL_DATA) profile.fish -D $(DESTDIR)$(datadir)/fish/vendor_conf.d/debuginfod.fish
 	mkdir -p $(DESTDIR)$(sysconfdir)/debuginfod
 	if [ -n "@DEBUGINFOD_URLS@" ]; then \
-- 
2.43.0



More information about the Elfutils-devel mailing list