From 0a5ada28ca164d861e40a772c6a55c713714682f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 11 Dec 2014 17:44:26 +0000
Subject: Fix make global-links with nonempty sproot

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7d8901c..9fd6b01 100644
--- a/Makefile
+++ b/Makefile
@@ -72,10 +72,10 @@ update:
 global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so=$(DESTDIR)$(sproot)/library.so/lib%.so) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(SBIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%)
 
 $(DESTDIR)$(sproot)/command/%: $(DESTDIR)$(home)/command/%
-	exec $(INSTALL) -D -l ..$(exthome)/command/$(<F) $@
+	exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/command/$(<F) $@
 
 $(DESTDIR)$(sproot)/library.so/lib%.so: $(DESTDIR)$(dynlibdir)/lib%.so
-	exec $(INSTALL) -D -l ..$(exthome)/library.so/$(<F) $@
+	exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/library.so/$(<F) $@
 
 .PHONY: update global-links
 
@@ -95,7 +95,7 @@ $(DESTDIR)$(libexecdir)/% $(DESTDIR)$(bindir)/% $(DESTDIR)$(sbindir)/%: % packag
 	chmod $$mode $@ ; }
 
 $(DESTDIR)$(libdir)/lib%.a: lib%.a
-	$(INSTALL) -D -m 644 $< $@
+	exec $(INSTALL) -D -m 644 $< $@
 
 $(DESTDIR)$(includedir)/$(package)/%.h: src/include/$(package)/%.h
 	exec $(INSTALL) -D -m 644 $< $@
-- 
cgit 1.4.1