aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Stanley Cheung <stanley.cheung@gmail.com>2015-09-23 09:38:57 -0700
committerGravatar Stanley Cheung <stanley.cheung@gmail.com>2015-09-23 09:38:57 -0700
commit4831d02cc2341ec2233ff9d9ef66fb9a86138fb7 (patch)
treeeb59c0244ac432587a87c337d6e17d23d8f88131
parent7f9fd016f62b6e22bbaab4eaa43eaab1e629e18f (diff)
parent6dad9b0821f7ad089715e77f5c80ae664e4966da (diff)
Merge pull request #3432 from nicolasnoble/gnu-make-grah
Fixing Makefile issue which would re-evaluate the base path for included dependency files.
-rw-r--r--Makefile2
-rw-r--r--templates/Makefile.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c3f6892067..bba9592a78 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ SYSTEM = MINGW32
endif
-MAKEFILE_PATH = $(abspath $(lastword $(MAKEFILE_LIST)))
+MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
ifndef BUILDDIR
BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
else
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 49c2f8b7f5..bf3f850fd2 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -65,7 +65,7 @@
endif
- MAKEFILE_PATH = $(abspath $(lastword $(MAKEFILE_LIST)))
+ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
ifndef BUILDDIR
BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
else