diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 17:44:54 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-11 17:44:54 +0000 |
| commit | 3407ee9e746fec36df9d78fb1c00582893ccd00a (patch) | |
| tree | 6ed73aa2f757a8c2eb9bf521c0ef0f05e165c875 | |
| parent | 219c9304e9d7b1d966bb7163936e99aeb4ec2727 (diff) | |
| download | s6-dns-3407ee9e746fec36df9d78fb1c00582893ccd00a.tar.xz | |
Fix make global-links with nonempty sproot
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 $< $@ |