diff --git a/base/mk/lib.mk b/base/mk/lib.mk index bbcd34b42d..e22fe8a77c 100644 --- a/base/mk/lib.mk +++ b/base/mk/lib.mk @@ -174,5 +174,5 @@ $(LIB_SO): $(STATIC_LIBS) $(OBJECTS) $(wildcard $(LD_SCRIPT_SO)) $(LIBGCC) $(INSTALL_SO): - $(VERBOSE)ln -sf `pwd`/$(LIB_SO) $@ + $(VERBOSE)ln -sf $(CURDIR)/$(LIB_SO) $@ diff --git a/base/mk/prg.mk b/base/mk/prg.mk index e2faa0de88..40a512da5e 100644 --- a/base/mk/prg.mk +++ b/base/mk/prg.mk @@ -190,7 +190,7 @@ $(TARGET): $(LINK_ITEMS) $(wildcard $(LD_SCRIPTS)) $(VERBOSE)libs=$(LIB_CACHE_DIR); $(LD_CMD) -o $@ $(INSTALL_DIR)/$(TARGET): $(TARGET) - $(VERBOSE)ln -sf `pwd`/$(TARGET) $@ + $(VERBOSE)ln -sf $(CURDIR)/$(TARGET) $@ else $(TARGET): $(INSTALL_DIR)/$(TARGET): $(TARGET) diff --git a/tool/builddir/build.mk b/tool/builddir/build.mk index ab93a86dd6..567e44fe19 100644 --- a/tool/builddir/build.mk +++ b/tool/builddir/build.mk @@ -37,9 +37,8 @@ -include etc/build.conf -PWD := $(shell pwd) -BUILD_BASE_DIR := $(PWD) -INSTALL_DIR := $(PWD)/bin +BUILD_BASE_DIR := $(CURDIR) +INSTALL_DIR := $(CURDIR)/bin export BASE_DIR ?= ../base export REPOSITORIES ?= $(BASE_DIR:%base=%base-linux) $(BASE_DIR)