Fossil SCM

In the MinGW makefile, ignore failures of the mkdir command in case the directory already exists.

mistachkin 2012-09-03 10:16 trunk
Commit 80c4b3a23f3be6ba3cc762b013bc96a68d215576
Parent d43e163a27b4477…
3 files changed +2 -2 +2 -2 +2 -2
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -547,21 +547,21 @@
547547
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
548548
 VERSION = $(subst /,\,$(OBJDIR)/version)
549549
 CP = copy
550550
 MV = copy
551551
 RM = del /Q
552
-MKDIR = mkdir
552
+MKDIR = -mkdir
553553
 RMDIR = rmdir /S /Q
554554
 else
555555
 TRANSLATE = $(OBJDIR)/translate
556556
 MAKEHEADERS = $(OBJDIR)/makeheaders
557557
 MKINDEX = $(OBJDIR)/mkindex
558558
 VERSION = $(OBJDIR)/version
559559
 CP = cp
560560
 MV = mv
561561
 RM = rm -f
562
-MKDIR = mkdir -p
562
+MKDIR = -mkdir -p
563563
 RMDIR = rm -rf
564564
 endif}
565565
566566
 writeln {
567567
 all: $(OBJDIR) $(APPNAME)
568568
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -547,21 +547,21 @@
547 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
548 VERSION = $(subst /,\,$(OBJDIR)/version)
549 CP = copy
550 MV = copy
551 RM = del /Q
552 MKDIR = mkdir
553 RMDIR = rmdir /S /Q
554 else
555 TRANSLATE = $(OBJDIR)/translate
556 MAKEHEADERS = $(OBJDIR)/makeheaders
557 MKINDEX = $(OBJDIR)/mkindex
558 VERSION = $(OBJDIR)/version
559 CP = cp
560 MV = mv
561 RM = rm -f
562 MKDIR = mkdir -p
563 RMDIR = rm -rf
564 endif}
565
566 writeln {
567 all: $(OBJDIR) $(APPNAME)
568
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -547,21 +547,21 @@
547 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
548 VERSION = $(subst /,\,$(OBJDIR)/version)
549 CP = copy
550 MV = copy
551 RM = del /Q
552 MKDIR = -mkdir
553 RMDIR = rmdir /S /Q
554 else
555 TRANSLATE = $(OBJDIR)/translate
556 MAKEHEADERS = $(OBJDIR)/makeheaders
557 MKINDEX = $(OBJDIR)/mkindex
558 VERSION = $(OBJDIR)/version
559 CP = cp
560 MV = mv
561 RM = rm -f
562 MKDIR = -mkdir -p
563 RMDIR = rm -rf
564 endif}
565
566 writeln {
567 all: $(OBJDIR) $(APPNAME)
568
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -511,21 +511,21 @@
511511
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512512
 VERSION = $(subst /,\,$(OBJDIR)/version)
513513
 CP = copy
514514
 MV = copy
515515
 RM = del /Q
516
-MKDIR = mkdir
516
+MKDIR = -mkdir
517517
 RMDIR = rmdir /S /Q
518518
 else
519519
 TRANSLATE = $(OBJDIR)/translate
520520
 MAKEHEADERS = $(OBJDIR)/makeheaders
521521
 MKINDEX = $(OBJDIR)/mkindex
522522
 VERSION = $(OBJDIR)/version
523523
 CP = cp
524524
 MV = mv
525525
 RM = rm -f
526
-MKDIR = mkdir -p
526
+MKDIR = -mkdir -p
527527
 RMDIR = rm -rf
528528
 endif
529529
530530
 all: $(OBJDIR) $(APPNAME)
531531
532532
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -511,21 +511,21 @@
511 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512 VERSION = $(subst /,\,$(OBJDIR)/version)
513 CP = copy
514 MV = copy
515 RM = del /Q
516 MKDIR = mkdir
517 RMDIR = rmdir /S /Q
518 else
519 TRANSLATE = $(OBJDIR)/translate
520 MAKEHEADERS = $(OBJDIR)/makeheaders
521 MKINDEX = $(OBJDIR)/mkindex
522 VERSION = $(OBJDIR)/version
523 CP = cp
524 MV = mv
525 RM = rm -f
526 MKDIR = mkdir -p
527 RMDIR = rm -rf
528 endif
529
530 all: $(OBJDIR) $(APPNAME)
531
532
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -511,21 +511,21 @@
511 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512 VERSION = $(subst /,\,$(OBJDIR)/version)
513 CP = copy
514 MV = copy
515 RM = del /Q
516 MKDIR = -mkdir
517 RMDIR = rmdir /S /Q
518 else
519 TRANSLATE = $(OBJDIR)/translate
520 MAKEHEADERS = $(OBJDIR)/makeheaders
521 MKINDEX = $(OBJDIR)/mkindex
522 VERSION = $(OBJDIR)/version
523 CP = cp
524 MV = mv
525 RM = rm -f
526 MKDIR = -mkdir -p
527 RMDIR = rm -rf
528 endif
529
530 all: $(OBJDIR) $(APPNAME)
531
532
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -511,21 +511,21 @@
511511
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512512
 VERSION = $(subst /,\,$(OBJDIR)/version)
513513
 CP = copy
514514
 MV = copy
515515
 RM = del /Q
516
-MKDIR = mkdir
516
+MKDIR = -mkdir
517517
 RMDIR = rmdir /S /Q
518518
 else
519519
 TRANSLATE = $(OBJDIR)/translate
520520
 MAKEHEADERS = $(OBJDIR)/makeheaders
521521
 MKINDEX = $(OBJDIR)/mkindex
522522
 VERSION = $(OBJDIR)/version
523523
 CP = cp
524524
 MV = mv
525525
 RM = rm -f
526
-MKDIR = mkdir -p
526
+MKDIR = -mkdir -p
527527
 RMDIR = rm -rf
528528
 endif
529529
530530
 all: $(OBJDIR) $(APPNAME)
531531
532532
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -511,21 +511,21 @@
511 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512 VERSION = $(subst /,\,$(OBJDIR)/version)
513 CP = copy
514 MV = copy
515 RM = del /Q
516 MKDIR = mkdir
517 RMDIR = rmdir /S /Q
518 else
519 TRANSLATE = $(OBJDIR)/translate
520 MAKEHEADERS = $(OBJDIR)/makeheaders
521 MKINDEX = $(OBJDIR)/mkindex
522 VERSION = $(OBJDIR)/version
523 CP = cp
524 MV = mv
525 RM = rm -f
526 MKDIR = mkdir -p
527 RMDIR = rm -rf
528 endif
529
530 all: $(OBJDIR) $(APPNAME)
531
532
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -511,21 +511,21 @@
511 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
512 VERSION = $(subst /,\,$(OBJDIR)/version)
513 CP = copy
514 MV = copy
515 RM = del /Q
516 MKDIR = -mkdir
517 RMDIR = rmdir /S /Q
518 else
519 TRANSLATE = $(OBJDIR)/translate
520 MAKEHEADERS = $(OBJDIR)/makeheaders
521 MKINDEX = $(OBJDIR)/mkindex
522 VERSION = $(OBJDIR)/version
523 CP = cp
524 MV = mv
525 RM = rm -f
526 MKDIR = -mkdir -p
527 RMDIR = rm -rf
528 endif
529
530 all: $(OBJDIR) $(APPNAME)
531
532

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button