소스 검색

Merge pull request #3432 from nicolasnoble/gnu-make-grah

Fixing Makefile issue which would re-evaluate the base path for included dependency files.
Stanley Cheung 10 년 전
부모
커밋
4831d02cc2
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      Makefile
  2. 1 1
      templates/Makefile.template

+ 1 - 1
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

+ 1 - 1
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