summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2014-12-11 17:44:14 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2014-12-11 17:44:14 +0000
commite3907e5ab3d0326cbaf38fde90a7f25ea7fd0471 (patch)
tree1ccdc01dabeebf914c31d1896789f4004e604632
parent28765e1d3d6cf97e3f96a130abd37848da5228b2 (diff)
downloads6-portable-utils-e3907e5ab3d0326cbaf38fde90a7f25ea7fd0471.tar.xz
Fix make global-links with nonempty sproot
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
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 $< $@