diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-18T11·57+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-18T11·57+0100 |
| commit | 79f699edca26c035a8bcd68c7d5a13b4fbcbf3be (patch) | |
| tree | 493bc59f07e63297dd032042128034cc96460f31 | |
| parent | 581a160c11dd3de66d9cd1a6e01c0641909546ef (diff) | |
More GNU Make 3.81 compatibility
| -rw-r--r-- | functions.mk | 3 | ||||
| -rw-r--r-- | install.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/functions.mk b/functions.mk index 1287e4321ea3..c92cdbc54ea0 100644 --- a/functions.mk +++ b/functions.mk @@ -9,3 +9,6 @@ filename-to-dep = $(dir $1).$(notdir $1).dep # Return the full path to a program by looking it up in $PATH, or the # empty string if not found. find-program = $(shell for i in $$(IFS=: ; echo $$PATH); do p=$$i/$(strip $1); if [ -e $$p ]; then echo $$p; break; fi; done) + +# Remove trailing slash. +remove-trailing-slash = $(patsubst %/,%,$(1)) diff --git a/install.mk b/install.mk index e4bc734e11fb..0fe4cf938d50 100644 --- a/install.mk +++ b/install.mk @@ -1,7 +1,7 @@ # Add a rule for creating $(1) as a directory. This template may be # called multiple times for the same directory. define create-dir - _i := $(DESTDIR)$$(strip $(1)) + _i := $$(call remove-trailing-slash, $(DESTDIR)$$(strip $(1))) ifndef $$(_i)_SEEN $$(_i)_SEEN = 1 $$(_i): |