diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 17:44:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 17:44:26 +0000 |
| commit | 0a5ada28ca164d861e40a772c6a55c713714682f (patch) | |
| tree | 272619e0260a8dec7895ec67225fe210f61483d3 | |
| parent | 9403746f56a852b9b744cd0951e6b05a7c6d5eb1 (diff) | |
| download | s6-linux-utils-0a5ada28ca164d861e40a772c6a55c713714682f.tar.gz s6-linux-utils-0a5ada28ca164d861e40a772c6a55c713714682f.tar.xz s6-linux-utils-0a5ada28ca164d861e40a772c6a55c713714682f.zip | |
Fix make global-links with nonempty sproot
| -rw-r--r-- | Makefile | 6 |
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 $< $@ |