[Guile-commits] 04/08: build: Make sed invocation fully portable

[Ludovic Courtès]

civodul pushed a commit to branch main
in repository guile.

commit ebcc9d1e3a9107f4198cce9c7355291d3255c0a5
Author: Jonas Hahnfeld <hahnjo@hahnjo.de>
AuthorDate: Thu Feb 22 21:57:41 2024 +0100

    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.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 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.