Tracing Makefile bug

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@159 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/as/Makefile b/as/Makefile
index 0d6071dcabefbbd1dc6b9ec8ed00874c61dc3486..412bad9a248861daa7fbcaba88fe588fd5527e1c 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,5 +1,5 @@
-TOPDIR = ..
-include $(TOPDIR)/Makefile.common
+PRJDIR = ..
+include $(PRJDIR)/Makefile.common
 
 PORTS = _z80 _gbz80
 
@@ -8,11 +8,11 @@ all:
 
 _z80: clean
        make -C z80
-       cp z80/as $(TOPDIR)/bin/as-z80
+       cp z80/as$(E) $(TOPDIR)/bin/as-z80$(E)
 
 _gbz80: clean
        make -C z80 "OPTS=-DGAMEBOY"
-       cp z80/as $(TOPDIR)/bin/as-gb
+       cp z80/as$(E) $(TOPDIR)/bin/as-gbz80$(E)
 
 clean:
        make -C z80 clean

diff --git a/as/z80/Makefile b/as/z80/Makefile
index 445d7b129e0d6a52dbd6b4731ddac18b69241761..b661827ed3d095e81f869370ddda27d11c7a527a 100644 (file)
--- a/as/z80/Makefile
+++ b/as/z80/Makefile
@@ -1,4 +1,4 @@
-PRJDIR         = ../..
+PRJDIR = ../..
 
 include $(PRJDIR)/Makefile.common
 

diff --git a/link/Makefile b/link/Makefile
index 2e24e17d5d4809d327e78dcab8b99b4e3e4ed4cc..94d77cb95777cd06297efa3e46490dad427cb0a6 100644 (file)
--- a/link/Makefile
+++ b/link/Makefile
@@ -1,5 +1,5 @@
-TOPDIR = ..
-include $(TOPDIR)/Makefile.common
+PRJDIR = ..
+include $(PRJDIR)/Makefile.common
 
 PORTS = _z80 _gbz80
 

diff --git a/link/z80/Makefile b/link/z80/Makefile
index b763d8232555934c4764878a2e99960e46c6b77e..2dc9707cdfedc985ef38bde91d5a87dad07c2eaf 100644 (file)
--- a/link/z80/Makefile
+++ b/link/z80/Makefile
@@ -1,6 +1,6 @@
-TOPDIR         = ../..
+PRJDIR         = ../..
 
-include $(TOPDIR)/Makefile.common
+include $(PRJDIR)/Makefile.common
 
 OBJS   = lkarea.o lkdata.o lkeval.o lkhead.o lkihx.o lklex.o \
          lklibr.o lklist.o lkmain.o lkrloc.o lks19.o lksym.o \