From f80bc97c22d6c238be8d7664c5b8732cf40c84f1 Mon Sep 17 00:00:00 2001
From: michaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 5 Mar 2000 22:50:53 +0000
Subject: [PATCH] Tracing Makefile bug

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@159 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 as/Makefile       | 8 ++++----
 as/z80/Makefile   | 2 +-
 link/Makefile     | 4 ++--
 link/z80/Makefile | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/as/Makefile b/as/Makefile
index 0d6071dc..412bad9a 100644
--- 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 445d7b12..b661827e 100644
--- 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 2e24e17d..94d77cb9 100644
--- 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 b763d823..2dc9707c 100644
--- 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 \
-- 
2.30.2