public inbox for elfutils@sourceware.org
 help / color / mirror / Atom feed
* [COMMITTED] config/Makefile.am: Modify profile.fish in all-local
@ 2024-05-10 22:00 Aaron Merey
  0 siblings, 0 replies; only message in thread
From: Aaron Merey @ 2024-05-10 22:00 UTC (permalink / raw)
  To: elfutils-devel; +Cc: Aaron Merey

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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-05-10 22:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-10 22:00 [COMMITTED] config/Makefile.am: Modify profile.fish in all-local Aaron Merey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).