diff options
| author | Han-Wen Nienhuys <hanwen@lilypond.org> | 2014-05-15 10:51:16 +0200 |
|---|---|---|
| committer | hanwen <hanwen@google.com> | 2014-05-22 07:53:43 +0200 |
| commit | 57ffd7abe84ffb14e82902b2616ee3fbaf808fd2 (patch) | |
| tree | 8f5254364a5d17b7589bc4424e0fadd44415b15c /stepmake | |
| parent | 12fb8869aa8c172eb6dc7bc996e90860013ec270 (diff) | |
Use built-in make functions for finding absolute paths.
Diffstat (limited to 'stepmake')
| -rw-r--r-- | stepmake/stepmake/generic-vars.make | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index b0fc521e93..fb75166e1b 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -1,9 +1,7 @@ -top-build-dir = $(shell cd $(depth) && pwd) -build-dir = $(shell cd . && pwd) -tree-dir = $(subst $(top-build-dir),,$(build-dir)) - -absdir = $(shell cd $(1) ; pwd) +top-build-dir := $(realpath $(depth) ) +build-dir := $(realpath . ) +tree-dir = $(subst $(top-build-dir),,$(build-dir)) ifneq ($(configure-srcdir),.) srcdir-build = 1 @@ -15,7 +13,7 @@ else src-depth = $(configure-srcdir) endif -top-src-dir := $(shell cd $(src-depth); pwd) +top-src-dir := $(realpath $(src-depth)) ifndef srcdir-build src-dir = . @@ -46,10 +44,6 @@ DEPTH = $(depth)/$(package-depth) INSTALLPY=$(buildscript-dir)/install -c INSTALL=$(INSTALLPY) -group-dir = $(shell cd $(DEPTH);pwd)/.. -patch-dir = $(group-dir)/patches -rpm-sources = $(release-dir) -rpm-build = $(group-dir)/RedHat/BUILD package-icon = $(outdir)/$(package)-icon.xpm ifneq ($(strip $(MY_PATCH_LEVEL)),) |