From 428d1b17c5f664d3cb8da4cd5687bd47bdd87877 Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Thu, 22 Feb 2024 21:57:41 +0100 Subject: [PATCH 1/2] build: Make sed invocation fully portable Commit 08041d216f attempted to make the "invocation compatible with BSD sed", but moving '-i' first does not solve the problem because it still requires to pass an argument. Instead just redirect the instantiated output into a temporary file and install that. * libguile/Makefile.am: Remove '-i' from INSTANTIATE. --- libguile/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 249e44a49..2641e7f69 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -492,9 +492,9 @@ install-exec-hook: ## Instantiate a template. INSTANTIATE = \ - $(SED) -i -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ - -e 's,[@]pkglibdir[@],$(pkglibdir),g' \ - -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g' + $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ + -e 's,[@]pkglibdir[@],$(pkglibdir),g' \ + -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g' install-data-hook: libguile-@GUILE_EFFECTIVE_VERSION@-gdb.scm @$(MKDIR_P) $(DESTDIR)$(libdir) @@ -518,9 +518,9 @@ install-data-hook: libguile-@GUILE_EFFECTIVE_VERSION@-gdb.scm cd $$here; \ echo " $(INSTALL_DATA) $< \ $(DESTDIR)$(libdir)/$$libname-gdb.scm"; \ - $(INSTALL_DATA) "$<" \ - "$(DESTDIR)$(libdir)/$$libname-gdb.scm"; \ - $(INSTANTIATE) "$(DESTDIR)$(libdir)/$$libname-gdb.scm" + $(INSTANTIATE) "$<" > $$libname-gdb.scm; \ + $(INSTALL_DATA) $$libname-gdb.scm \ + "$(DESTDIR)$(libdir)/$$libname-gdb.scm"; # Remove the GDB support file and the Info 'dir' file that # 'install-info' 5.x installs. -- 2.43.2