Fossil SCM

Fixes to the install target in the MinGW makefile when building from the Windows shell.

mistachkin 2012-09-03 03:30 trunk
Commit 13eed7c65330dfa4a8bd50dd7b1e39c6078c30e8
Parent 7bf4c290a5a16b3…
3 files changed +7 -4 +7 -4 +7 -4
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+7 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,19 +534,22 @@
534534
 writeln "\n"
535535
 writeln "APPNAME = ${name}.exe"
536536
 writeln {
537537
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
538538
 # inside of a Windows-style shell; otherwise, it is assumed that we are
539
-# building inside of a Unix-style shell.
539
+# building inside of a Unix-style shell. Note that the "move" command is
540
+# broken when attempting to use it from the Windows shell via MinGW make
541
+# because the SHELL variable is only used for certain commands that are
542
+# recognized internally by make.
540543
 #
541544
 ifdef USE_WINDOWS
542545
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
543546
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
544547
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
545548
 VERSION = $(subst /,\,$(OBJDIR)/version)
546549
 CP = copy
547
-MV = move
550
+MV = copy
548551
 RM = del /Q
549552
 MKDIR = mkdir
550553
 RMDIR = rmdir /S /Q
551554
 else
552555
 TRANSLATE = $(OBJDIR)/translate
@@ -571,14 +574,14 @@
571574
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
572575
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
573576
 endif
574577
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
575578
576
-install: $(APPNAME)
579
+install: $(OBJDIR) $(APPNAME)
577580
 ifdef USE_WINDOWS
578581
 $(MKDIR) $(subst /,\,$(INSTALLDIR))
579
- $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
582
+ $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
580583
 else
581584
 $(MKDIR) $(INSTALLDIR)
582585
 $(MV) $(APPNAME) $(INSTALLDIR)
583586
 endif
584587
585588
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,19 +534,22 @@
534 writeln "\n"
535 writeln "APPNAME = ${name}.exe"
536 writeln {
537 #### If the USE_WINDOWS variable exists, it is assumed that we are building
538 # inside of a Windows-style shell; otherwise, it is assumed that we are
539 # building inside of a Unix-style shell.
 
 
 
540 #
541 ifdef USE_WINDOWS
542 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
543 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
544 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
545 VERSION = $(subst /,\,$(OBJDIR)/version)
546 CP = copy
547 MV = move
548 RM = del /Q
549 MKDIR = mkdir
550 RMDIR = rmdir /S /Q
551 else
552 TRANSLATE = $(OBJDIR)/translate
@@ -571,14 +574,14 @@
571 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
572 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
573 endif
574 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
575
576 install: $(APPNAME)
577 ifdef USE_WINDOWS
578 $(MKDIR) $(subst /,\,$(INSTALLDIR))
579 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
580 else
581 $(MKDIR) $(INSTALLDIR)
582 $(MV) $(APPNAME) $(INSTALLDIR)
583 endif
584
585
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -534,19 +534,22 @@
534 writeln "\n"
535 writeln "APPNAME = ${name}.exe"
536 writeln {
537 #### If the USE_WINDOWS variable exists, it is assumed that we are building
538 # inside of a Windows-style shell; otherwise, it is assumed that we are
539 # building inside of a Unix-style shell. Note that the "move" command is
540 # broken when attempting to use it from the Windows shell via MinGW make
541 # because the SHELL variable is only used for certain commands that are
542 # recognized internally by make.
543 #
544 ifdef USE_WINDOWS
545 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
546 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
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
@@ -571,14 +574,14 @@
574 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
575 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
576 endif
577 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
578
579 install: $(OBJDIR) $(APPNAME)
580 ifdef USE_WINDOWS
581 $(MKDIR) $(subst /,\,$(INSTALLDIR))
582 $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
583 else
584 $(MKDIR) $(INSTALLDIR)
585 $(MV) $(APPNAME) $(INSTALLDIR)
586 endif
587
588
M win/Makefile.mingw
+7 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -498,19 +498,22 @@
498498
499499
 APPNAME = fossil.exe
500500
501501
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502502
 # inside of a Windows-style shell; otherwise, it is assumed that we are
503
-# building inside of a Unix-style shell.
503
+# building inside of a Unix-style shell. Note that the "move" command is
504
+# broken when attempting to use it from the Windows shell via MinGW make
505
+# because the SHELL variable is only used for certain commands that are
506
+# recognized internally by make.
504507
 #
505508
 ifdef USE_WINDOWS
506509
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507510
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508511
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509512
 VERSION = $(subst /,\,$(OBJDIR)/version)
510513
 CP = copy
511
-MV = move
514
+MV = copy
512515
 RM = del /Q
513516
 MKDIR = mkdir
514517
 RMDIR = rmdir /S /Q
515518
 else
516519
 TRANSLATE = $(OBJDIR)/translate
@@ -534,14 +537,14 @@
534537
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535538
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536539
 endif
537540
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538541
539
-install: $(APPNAME)
542
+install: $(OBJDIR) $(APPNAME)
540543
 ifdef USE_WINDOWS
541544
 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542
- $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
545
+ $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
543546
 else
544547
 $(MKDIR) $(INSTALLDIR)
545548
 $(MV) $(APPNAME) $(INSTALLDIR)
546549
 endif
547550
548551
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -498,19 +498,22 @@
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell.
 
 
 
504 #
505 ifdef USE_WINDOWS
506 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509 VERSION = $(subst /,\,$(OBJDIR)/version)
510 CP = copy
511 MV = move
512 RM = del /Q
513 MKDIR = mkdir
514 RMDIR = rmdir /S /Q
515 else
516 TRANSLATE = $(OBJDIR)/translate
@@ -534,14 +537,14 @@
534 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536 endif
537 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538
539 install: $(APPNAME)
540 ifdef USE_WINDOWS
541 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543 else
544 $(MKDIR) $(INSTALLDIR)
545 $(MV) $(APPNAME) $(INSTALLDIR)
546 endif
547
548
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -498,19 +498,22 @@
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell. Note that the "move" command is
504 # broken when attempting to use it from the Windows shell via MinGW make
505 # because the SHELL variable is only used for certain commands that are
506 # recognized internally by make.
507 #
508 ifdef USE_WINDOWS
509 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
510 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
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
@@ -534,14 +537,14 @@
537 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
538 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
539 endif
540 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
541
542 install: $(OBJDIR) $(APPNAME)
543 ifdef USE_WINDOWS
544 $(MKDIR) $(subst /,\,$(INSTALLDIR))
545 $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
546 else
547 $(MKDIR) $(INSTALLDIR)
548 $(MV) $(APPNAME) $(INSTALLDIR)
549 endif
550
551
M win/Makefile.mingw.mistachkin
+7 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -498,19 +498,22 @@
498498
499499
 APPNAME = fossil.exe
500500
501501
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502502
 # inside of a Windows-style shell; otherwise, it is assumed that we are
503
-# building inside of a Unix-style shell.
503
+# building inside of a Unix-style shell. Note that the "move" command is
504
+# broken when attempting to use it from the Windows shell via MinGW make
505
+# because the SHELL variable is only used for certain commands that are
506
+# recognized internally by make.
504507
 #
505508
 ifdef USE_WINDOWS
506509
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507510
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508511
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509512
 VERSION = $(subst /,\,$(OBJDIR)/version)
510513
 CP = copy
511
-MV = move
514
+MV = copy
512515
 RM = del /Q
513516
 MKDIR = mkdir
514517
 RMDIR = rmdir /S /Q
515518
 else
516519
 TRANSLATE = $(OBJDIR)/translate
@@ -534,14 +537,14 @@
534537
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535538
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536539
 endif
537540
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538541
539
-install: $(APPNAME)
542
+install: $(OBJDIR) $(APPNAME)
540543
 ifdef USE_WINDOWS
541544
 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542
- $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
545
+ $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
543546
 else
544547
 $(MKDIR) $(INSTALLDIR)
545548
 $(MV) $(APPNAME) $(INSTALLDIR)
546549
 endif
547550
548551
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -498,19 +498,22 @@
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell.
 
 
 
504 #
505 ifdef USE_WINDOWS
506 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509 VERSION = $(subst /,\,$(OBJDIR)/version)
510 CP = copy
511 MV = move
512 RM = del /Q
513 MKDIR = mkdir
514 RMDIR = rmdir /S /Q
515 else
516 TRANSLATE = $(OBJDIR)/translate
@@ -534,14 +537,14 @@
534 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536 endif
537 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538
539 install: $(APPNAME)
540 ifdef USE_WINDOWS
541 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543 else
544 $(MKDIR) $(INSTALLDIR)
545 $(MV) $(APPNAME) $(INSTALLDIR)
546 endif
547
548
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -498,19 +498,22 @@
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell. Note that the "move" command is
504 # broken when attempting to use it from the Windows shell via MinGW make
505 # because the SHELL variable is only used for certain commands that are
506 # recognized internally by make.
507 #
508 ifdef USE_WINDOWS
509 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
510 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
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
@@ -534,14 +537,14 @@
537 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
538 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
539 endif
540 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
541
542 install: $(OBJDIR) $(APPNAME)
543 ifdef USE_WINDOWS
544 $(MKDIR) $(subst /,\,$(INSTALLDIR))
545 $(MV) $(subst /,\,$(APPNAME)) $(subst /,\,$(INSTALLDIR))
546 else
547 $(MKDIR) $(INSTALLDIR)
548 $(MV) $(APPNAME) $(INSTALLDIR)
549 endif
550
551

Keyboard Shortcuts

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