bld: correct build make files after wmake backward compatibility changes

open-watcom · Apr 28, 2024 · 6b58c7f · 6b58c7f
1 parent 21e4775
commit 6b58c7f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/bld/awk/master.mif b/bld/awk/master.mif
@@ -46,7 +46,7 @@ exetarg_objs = &
 # rc and others
 #
 proctab.c : ./maketab.exe ../h/ytab.h
-    $(noecho)copy $]@ ytab.h
+    $(noecho)%copy $]@ ytab.h
     @%make echo_execute
     $(noecho)$[@ > proctab.c
 

diff --git a/bld/builder/master.mif b/bld/builder/master.mif
@@ -63,7 +63,7 @@ $(build_dir)/$(%OWOBJDIR)/builder : builder.exe         # Remove .exe from worki
 !else
 $(build_dir)/$(%OWOBJDIR)/builder.exe : builder.exe
 !endif
-    copy $[@ $@
+    %copy $[@ $@
 !endif
 !endif
 

diff --git a/bld/idedemo/master.mif b/bld/idedemo/master.mif
@@ -30,7 +30,7 @@ $(host_os)_3d.mk1: $(host_os)_3d.tgt
     @SET WATCOM=
     $(ide2make) -l -r $< -i $(ide_cfg_dir_$(host_os))
     sed -f "$(idedemo_dir)/convtool.sed" -f "$(idedemo_dir)/conv$(host_os).sed" $(host_os)_3d.mk1 >temp.mk1
-    copy temp.mk1 $(host_os)_3d.mk1
+    %copy temp.mk1 $(host_os)_3d.mk1
 !endif
 
 clean: .SYMBOLIC

diff --git a/bld/misc/master.mif b/bld/misc/master.mif
@@ -10,7 +10,7 @@ misc_objs = &
     unicode.852
 
 $(misc_objs):
-    copy ../$@ $@
+    %copy ../$@ $@
 
 clean: .symbolic
     rm -f $(misc_objs)
diff --git a/build/mif/testenv.mif b/build/mif/testenv.mif
@@ -210,14 +210,14 @@ test.lnk : $(__MAKEFILES__) .EXPLICIT
     @*awk -v target=$(init_$^&) -f $(wasmtest_dir)/createc.awk -v OUTFILE=$^. $[@
 
 .src.gcp:
-    @copy $< $@
+    @%copy $< $@
 !else
 .asm.gc:
     @set ERROR_MSG=failure to create $^.
     @*awk -v target=$(init_$^&) -f $(wasmtest_dir)/createc.awk -v OUTFILE=$^. $[@
 
 .src.gc:
-    @copy $< $@
+    @%copy $< $@
 !endif
 
 !endif

diff --git a/distrib/ow/master.mif b/distrib/ow/master.mif
@@ -112,9 +112,9 @@ $(distrib_bindir)/$(installer_c) : ../files.dat $(distrib_bindir) $(setup_c) .AL
     @rm -f *.__c
     @%make clean_inf
     langdat -l filelist $(langdat_keys) -r $(bld_ver) -c $[@ c
-    @copy $]@ setup.exe
+    @%copy $]@ setup.exe
     mkinf -i.. -i../../include -dBldVer=$(bld_ver_str) -dDstDir=$(dstdir) $(mkinf_opt) $(mkinf_opt_$(host_os)) c filelist "$(%OWRELROOT)"
-    @copy setup.inf "$(%OWRELROOT)/setup.inf"
+    @%copy setup.inf "$(%OWRELROOT)/setup.inf"
     uzip setup.zip instarch.lst "$(%OWRELROOT)"
     @rm "$(%OWRELROOT)/setup.inf"
     @rm setup.exe
@@ -132,9 +132,9 @@ $(distrib_bindir)/$(installer_f77) : ../files.dat $(distrib_bindir) $(setup_f77)
     @rm -f *.__f
     @%make clean_inf
     langdat -l filelist $(langdat_keys) -r $(bld_ver) -c $[@ f77
-    @copy $]@ setup.exe
+    @%copy $]@ setup.exe
     mkinf -i.. -i../../include -dBldVer=$(bld_ver_str) -dDstDir=$(dstdir) $(mkinf_opt) $(mkinf_opt_$(host_os)) f77 filelist "$(%OWRELROOT)"
-    @copy setup.inf "$(%OWRELROOT)/setup.inf"
+    @%copy setup.inf "$(%OWRELROOT)/setup.inf"
     uzip setup.zip instarch.lst "$(%OWRELROOT)"
     @rm "$(%OWRELROOT)/setup.inf"
     @rm setup.exe

diff --git a/docs/mif/master.mif b/docs/mif/master.mif
@@ -329,7 +329,7 @@ $(wikidir):
 .ps.pdf :
     !$(hc_pdf) -r600 $[@ $@
 !  ifdef wikidir
-    $(noecho)copy $^&.pdf $(wikidir)\$^&.pdf
+    $(noecho)%copy $^&.pdf $(wikidir)\$^&.pdf
 !  endif
 ! endif
 
@@ -363,8 +363,8 @@ $(wikidir):
 ! ifeq dotarget chm
 .htm.chm :
     @if not exist $^& mkdir $^&
-    @for %f in ($($^&_book_bmps)) do $(noecho)copy %f $^&
-    copy $^&.gh $^&/$^&.gh
+    @for %f in ($($^&_book_bmps)) do $(noecho)%copy %f $^&
+    %copy $^&.gh $^&/$^&.gh
     awk -f ../splithtm.awk -v dir=$^& $^&.htm
     awk -f ../makehha.awk $^&.htm >$^&/$^&.hha
     awk -f ../makehhc.awk $^&.htm >$^&/$^&.hhc
@@ -377,28 +377,28 @@ $(wikidir):
     -chmod +rw $@
 !   endif
     cd ..
-    copy $^&/$^&.chm $@
+    %copy $^&/$^&.chm $@
 !  else ifeq bld_os linux
     @%create $(wine_hc_batch)
     @%append $(wine_hc_batch) $(hc_hh) $^&/$^&.hhp
     @%append $(wine_hc_batch) copy /y $^&\$^&.chm $^&.chm
     -wine cmd /c $(wine_hc_batch)
 !  else
     -$(hc_hh) $^&/$^&.hhp
-    copy $^&/$^&.chm $^&.chm
+    %copy $^&/$^&.chm $^&.chm
 !  endif
 ! endif
 
 {$(root_books)}.gml.htm &
 {$(root_books)}.gml.gh :
     @echo BOOK : $^&
 ! ifeq dotarget html
-    @for %f in ($($^&_book_bmps)) do $(noecho)copy %f .
+    @for %f in ($($^&_book_bmps)) do $(noecho)%copy %f .
 ! endif
     @%make compile_gml_to_xxx
 ! ifdef wikidir
-    $(noecho)copy $^&.htm $(wikidir)\$^&.html
-    @for %f in (*.bmp) do @if not exist $(wikidir)\%f $(noecho)copy %f $(wikidir)\%f
+    $(noecho)%copy $^&.htm $(wikidir)\$^&.html
+    @for %f in (*.bmp) do @if not exist $(wikidir)\%f $(noecho)%copy %f $(wikidir)\%f
 ! endif
 
 ####################################################
-Original file line number
+Diff line change
@@ Expand Up @@
     !else
     $(build_dir)/$(%OWOBJDIR)/builder.exe : builder.exe
     !endif
-        copy $[@ $@
+        %copy $[@ $@
     !endif
     !endif
@@ Expand Down @@