From: John Hodge Date: Mon, 14 May 2012 06:56:47 +0000 (+0800) Subject: Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2 X-Git-Tag: rel0.15~707 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=385aa5c4b5e509d298b3341dcd27ca26c3ce2358;hp=0fea0b04ca1c979de681b237d7952126db3e2471;p=tpg%2Facess2.git Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2 --- diff --git a/Makefile.cfg b/Makefile.cfg index 14d5065f..53784d29 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -2,14 +2,14 @@ # Acess2 Build Configuration # +ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST))) +ACESSDIR := $(shell cd $(ACESSDIR) && pwd) + # Install destination configuration -DISTROOT := a:/Acess2 +DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2 xCP := mcopy -D o xMKDIR := mmd -D s -ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST))) -ACESSDIR := $(shell cd $(ACESSDIR) && pwd) - -include $(ACESSDIR)/Makefile.Version.cfg # Default build programs