DOS gcc makefile fix

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index 13fac5faa127dff37f9fa16a4e502fd5a5aea9b9..386263f4e5b44a084b965e45a2b3eb91c124d25f 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -67,6 +67,10 @@ LIBRARIES = $(LIBS) $(TERMLIB)
 # If you have yacc/lex or a work-alike set YACC_LEX to Y
 #
 YACC_LEX = Y
+ifeq ($(YACC_LEX),Y)
+DO_YACC = YACC_ACT
+DO_LEX  = LEX_ACT
+endif
 
 # If YACC_LEX is Y above, set the following to values appropriate for
 # your tools.
@@ -609,15 +613,15 @@ $(O)lev_main.o:  $(HACK_H) $(INCL)/sp_lev.h $(INCL)/date.h $(U)lev_main.c
 
 ifeq  "$(DO_YACC)" "YACC_ACT"
 
-$(INCL)/lev_comp.h: lev_yacc.c
+$(INCL)/lev_comp.h: $(U)lev_yacc.c
 
 $(U)lev_yacc.c $(INCL)/lev_comp.h : $(U)lev_comp.y
-       @$(subst /,\,chdir $(U)) & \
-       @$(subst /,\,$(YACC) -d lev_comp.y) & \
-       @$(subst /,\,copy $(YTABC) lev_yacc.c) & \
-       @$(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h) & \
-       @$(subst /,\,@del $(YTABC)) & \
-       @$(subst /,\,@del $(YTABH)) & \
+       @$(subst /,\,chdir $(UTIL))
+       @$(subst /,\,$(YACC) -d lev_comp.y)
+       @$(subst /,\,copy $(YTABC) lev_yacc.c)
+       @$(subst /,\,copy $(YTABH) $(INCL)/lev_comp.h)
+       @$(subst /,\,@del $(YTABC))
+       @$(subst /,\,@del $(YTABH))
        @$(subst /,\,chdir $(SRC))
 else
 
@@ -639,10 +643,11 @@ endif
 
 $(U)lev_$(LEX).c: $(U)lev_comp.l
 ifeq  "$(DO_LEX)" "LEX_ACT"
-       @$(subst /,\,chdir $(U)) & \
-       @$(subst /,\,$(LEX) $(FLEXSKEL) lev_comp.l) & \
-       @$(subst /,\,copy $(LEXYYC) $@) & \
-       @$(subst /,\,@del $(LEXYYC)) & \
+       @$(subst /,\,chdir $(UTIL))
+       @$(subst /,\,$(LEX) $(FLEXSKEL) lev_comp.l)
+       @$(subst /,\,if exist $@ del $@)
+       @$(subst /,\,copy $(LEXYYC) $@)
+       @$(subst /,\,del $(LEXYYC))
        @$(subst /,\,chdir $(SRC))
 else
        @echo ---
@@ -661,12 +666,12 @@ $(U)dgn_comp.exe:  $(DGNCOMPOBJS)
 
 ifeq  "$(DO_YACC)" "YACC_ACT"
 $(U)dgn_yacc.c $(INCL)/dgn_comp.h : $(U)dgn_comp.y
-       @$(subst /,\,chdir $(U)) & \
-       @$(subst /,\,$(YACC) -d dgn_comp.y) & \
-       @$(subst /,\,copy $(YTABC) dgn_yacc.c) & \
-       @$(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h) & \
-       @$(subst /,\,@del $(YTABC)) & \
-       @$(subst /,\,@del $(YTABH)) & \
+       @$(subst /,\,chdir $(UTIL))
+       @$(subst /,\,$(YACC) -d dgn_comp.y)
+       @$(subst /,\,copy $(YTABC) dgn_yacc.c)
+       @$(subst /,\,copy $(YTABH) $(INCL)/dgn_comp.h)
+       @$(subst /,\,@del $(YTABC))
+       @$(subst /,\,@del $(YTABH))
        @$(subst /,\,chdir $(SRC))
 else
 $(U)dgn_yacc.c: $(SSHR)/dgn_yacc.c
@@ -688,10 +693,11 @@ endif
 ifeq  "$(DO_LEX)" "LEX_ACT"
 
 $(U)dgn_$(LEX).c: $(U)dgn_comp.l $(INCL)/dgn_comp.h
-       @$(subst /,\,chdir $(U)) & \
-       @$(subst /,\,$(LEX) $(FLEXSKEL)  dgn_comp.l) & \
-       @$(subst /,\,copy $(LEXYYC) $@) & \
-       @$(subst /,\,@del $(LEXYYC)) & \
+       @$(subst /,\,chdir $(UTIL))
+       @$(subst /,\,$(LEX) $(FLEXSKEL) dgn_comp.l)
+       @$(subst /,\,if exist $@ del $@)
+       @$(subst /,\,copy $(LEXYYC) $@)
+       @$(subst /,\,del $(LEXYYC))
        @$(subst /,\,chdir $(SRC))
 else