civodul pushed a commit to branch stable-2.2 in repository guile. commit 7ade0485af40fef38ae666331031b733530a95bc Author: Ludovic Courtès <l...@gnu.org> Date: Fri Feb 16 14:25:21 2018 +0100
build: Use 'sed' invocation compatible with BSD sed. Fixes <https://bugs.gnu.org/30011>. Reported by ilove zfs <ilove...@icloud.com>. * libguile/Makefile.am (INSTANTIATE): Move '-i' first. --- libguile/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libguile/Makefile.am b/libguile/Makefile.am index a9646d8..0fceee0 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with Automake to create Makefile.in ## ## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, -## 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017 Free Software Foundation, Inc. +## 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2018 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -469,11 +469,10 @@ install-exec-hook: rm -f $(DESTDIR)$(bindir)/guile-snarf.awk ## Instantiate a template. -INSTANTIATE = \ - $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ - -e 's,[@]pkglibdir[@],$(pkglibdir),g' \ - -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g' \ - -i +INSTANTIATE = \ + $(SED) -i -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ + -e 's,[@]pkglibdir[@],$(pkglibdir),g' \ + -e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g' install-data-hook: libguile-2.2-gdb.scm @$(MKDIR_P) $(DESTDIR)$(libdir)