X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=0bd9ef9c0f6d3832c444015a244ed4cbcdbb7dc1;hb=69116cfff2e915ad9d2f95268432fe4bd0e007d9;hp=bbc64e1b20018ddf66fdcb8592e0bbd5f1fda614;hpb=54460b8770fffd34cf39929bb4c718175e9317c8;p=16.git

diff --git a/makefile b/makefile
index bbc64e1b..0bd9ef9c 100755
--- a/makefile
+++ b/makefile
@@ -55,7 +55,7 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /q
 DIRSEP=\
 OBJ=obj
 DUMP=type
@@ -495,7 +495,6 @@ clean: .symbolic
 	@if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
 	@wmake -s -h initscript
 	@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
-	@wmake -s -h exe2e
 !ifdef __LINUX__
 	@if exist *.LIB $(REMOVECOMMAND) *.LIB
 	@. src/util/bcexmm.sh
@@ -508,6 +507,7 @@ clean: .symbolic
 !else
 	@if exist *.o $(REMOVECOMMAND) *.o
 !endif
+	@wmake -s -h exe2e
 	@if exist *.$(OBJ) $(REMOVECOMMAND) *.$(OBJ)
 	@if exist *.bco $(REMOVECOMMAND) *.bco
 	@if exist *.BCO $(REMOVECOMMAND) *.BCO
@@ -578,19 +578,19 @@ initscript: .symbolic
 
 
 comp: .symbolic
-	@*upx -9 *.exe#$(EXEC)
+	@if exist *.exe @upx -9 *.exe#$(EXEC)
 	@wmake -s -h e2exe
 
 comq: .symbolic
-	@*upx -9 $(UPXQ) *.exe#$(EXEC)
+	@if exist *.exe @upx -9 $(UPXQ) *.exe#$(EXEC)
 	@wmake -s -h e2exe
 
 exe2e: .symbolic
-	@if exist *.exe $(MOVECOMMAND) *.exe *.e
+	@if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
 	#@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 
 e2exe: .symbolic
-	@if exist *.e $(MOVECOMMAND) *.e *.exe
+	@if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
 	@if exist 16.exe @wmake -s -h wwwdo