From 11a5c34a9d9edc353e7c6da763186c59339ae229 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 16 Sep 2015 21:05:36 -0400 Subject: common.mk: begone with $(rootdir), use the more reliable -r flag --- common.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/common.mk b/common.mk index 69bcc06..66d6c24 100644 --- a/common.mk +++ b/common.mk @@ -28,11 +28,6 @@ indent = emacs --batch $1 \ # Normalize a .po(t) file pofmt = msguniq -Fi --to-code=UTF-8 -# Usage: as a variable -# relative path to `/` from $(bindir) -# used for symlinking libexec files -rootdir = $(shell sed -r 's|^/||;s|[^/]+|..|g'<<<$(bindir)) - # Detect things about the director we're in #################################### progs += $(filter-out $(no-progs),$(shell find . -maxdepth 1 -type f -executable -printf '%f\n')) @@ -125,7 +120,7 @@ $(sort $(addprefix $(DESTDIR)$(bindir)/,$(filter-out $(libexecs),$(progs)))): $( install -Dm755 '$<' '$@' $(sort $(addprefix $(DESTDIR)$(bindir)/,$(libexecs))): $(DESTDIR)$(bindir)/%: % install -d '$(@D)' - ln -sf '$(rootdir)$(pkglibexecdir)/$(@F)' "$@" + ln -srf '$(pkglibexecdir)/$(@F)' '$@' # pkglibexecdir: $(libexecs) vs $(libs) $(sort $(addprefix $(DESTDIR)$(pkglibexecdir)/,$(libexecs))): $(DESTDIR)$(pkglibexecdir)/%: % install -Dm755 '$<' '$@' -- cgit v1.2.2