From c9d15999cac8d04cd91540d6fb8aaf0cca480b0a Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 22 Nov 2017 10:20:39 +0100 Subject: [PATCH] Really fix make-install for non gnu systems --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 90b1f86e1..f5f896537 100644 --- a/Makefile +++ b/Makefile @@ -402,7 +402,7 @@ endif $(DESTDIR)$(BINDIR) # Adjust PREFIX value in script files (non-gui) - sed -e 's?X-PREFIX-X?$(PREFIX)?' -i \ + sed -i -e 's?X-PREFIX-X?$(PREFIX)?' \ $(DESTDIR)$(BINDIR)/carla-single # Install backend libs @@ -429,15 +429,15 @@ endif $(DESTDIR)$(LIBDIR)/pkgconfig # Adjust PREFIX, LIBDIR and INCLUDEDIR in pkg-config files - sed -e 's?X-PREFIX-X?$(PREFIX)?' -i \ + sed -i -e 's?X-PREFIX-X?$(PREFIX)?' \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc - sed -e 's?X-LIBDIR-X?$(LIBDIR)?' -i \ + sed -i -e 's?X-LIBDIR-X?$(LIBDIR)?' \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc - sed -e 's?X-INCLUDEDIR-X?$(INCLUDEDIR)?' -i \ + sed -i -e 's?X-INCLUDEDIR-X?$(INCLUDEDIR)?' \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc \ $(DESTDIR)$(LIBDIR)/pkgconfig/carla-utils.pc @@ -488,7 +488,7 @@ ifeq ($(HAVE_PYQT),true) $(DESTDIR)$(BINDIR) # Adjust PREFIX value in script files (gui) - sed -e 's?X-PREFIX-X?$(PREFIX)?' -i \ + sed -i -e 's?X-PREFIX-X?$(PREFIX)?' \ $(DESTDIR)$(BINDIR)/carla \ $(DESTDIR)$(BINDIR)/carla-database \ $(DESTDIR)$(BINDIR)/carla-jack-multi \ @@ -502,7 +502,7 @@ ifeq ($(HAVE_LIBLO),true) data/carla-control \ $(DESTDIR)$(BINDIR) - sed -e 's?X-PREFIX-X?$(PREFIX)?' -i \ + sed -i -e 's?X-PREFIX-X?$(PREFIX)?' \ $(DESTDIR)$(BINDIR)/carla-control endif @@ -518,10 +518,10 @@ endif $(DESTDIR)$(DATADIR)/carla # Adjust LIBDIR and DATADIR value in python code - sed -e 's?X_LIBDIR_X = None?X_LIBDIR_X = "$(LIBDIR)"?' -i \ + sed -i -e 's?X_LIBDIR_X = None?X_LIBDIR_X = "$(LIBDIR)"?' \ $(DESTDIR)$(DATADIR)/carla/carla_shared.py - sed -e 's?X_DATADIR_X = None?X_DATADIR_X = "$(DATADIR)"?' -i \ + sed -i -e 's?X_DATADIR_X = None?X_DATADIR_X = "$(DATADIR)"?' \ $(DESTDIR)$(DATADIR)/carla/carla_shared.py # Install resources (gui)