Fossil SCM
Make the shell commands used by the MinGW more configurable and attempt to support building inside the Windows command prompt.
Commit
ce55bc43bdb3b880819937b98e12dd212ce1c54c
Parent
4e8d2f2991be784…
3 files changed
+17
-9
+17
-9
+17
-9
+17
-9
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -531,40 +531,48 @@ | ||
| 531 | 531 | writeln -nonewline " \\\n \$(OBJDIR)/$s.o" |
| 532 | 532 | } |
| 533 | 533 | writeln "\n" |
| 534 | 534 | writeln "APPNAME = ${name}.exe" |
| 535 | 535 | writeln { |
| 536 | -#### Attempt to determine if this is the actual MSYS shell. If so, we need to | |
| 537 | -# use forward slashes for correctness. If the SHELL environment variable | |
| 538 | -# exists, it is assumed that we are building inside of a Unix-style shell. | |
| 536 | +#### If the SHELL environment variable exists, it is assumed that we are | |
| 537 | +# building inside of a Unix-style shell; otherwise, it is assumed that | |
| 538 | +# we are building inside of a Windows-style shell. | |
| 539 | 539 | # |
| 540 | 540 | ifdef SHELL |
| 541 | 541 | TRANSLATE = $(OBJDIR)/translate |
| 542 | 542 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 543 | 543 | MKINDEX = $(OBJDIR)/mkindex |
| 544 | 544 | VERSION = $(OBJDIR)/version |
| 545 | +CP = cp | |
| 546 | +MV = mv | |
| 547 | +RM = rm -rf | |
| 548 | +MKDIR = mkdir -p | |
| 545 | 549 | else |
| 546 | 550 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 547 | 551 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 548 | 552 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 549 | 553 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 554 | +CP = copy | |
| 555 | +MV = move | |
| 556 | +RM = del /S /Q | |
| 557 | +MKDIR = mkdir | |
| 550 | 558 | endif} |
| 551 | 559 | |
| 552 | 560 | writeln { |
| 553 | 561 | all: $(OBJDIR) $(APPNAME) |
| 554 | 562 | |
| 555 | 563 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 556 | - cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 557 | - cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 564 | + $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 565 | + $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 558 | 566 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 559 | 567 | |
| 560 | 568 | install: $(APPNAME) |
| 561 | - mkdir -p $(INSTALLDIR) | |
| 562 | - mv $(APPNAME) $(INSTALLDIR) | |
| 569 | + $(MKDIR) $(INSTALLDIR) | |
| 570 | + $(MV) $(APPNAME) $(INSTALLDIR) | |
| 563 | 571 | |
| 564 | 572 | $(OBJDIR): |
| 565 | - mkdir $(OBJDIR) | |
| 573 | + $(MKDIR) $(OBJDIR) | |
| 566 | 574 | |
| 567 | 575 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 568 | 576 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 569 | 577 | |
| 570 | 578 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -608,11 +616,11 @@ | ||
| 608 | 616 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 609 | 617 | # command. "del" will not work here because it is not a separate command |
| 610 | 618 | # but a MSDOS-shell builtin. |
| 611 | 619 | # |
| 612 | 620 | clean: |
| 613 | - rm -rf $(OBJDIR) $(APPNAME) | |
| 621 | + $(RM) $(OBJDIR) $(APPNAME) | |
| 614 | 622 | |
| 615 | 623 | setup: $(OBJDIR) $(APPNAME) |
| 616 | 624 | $(MAKENSIS) ./fossil.nsi |
| 617 | 625 | |
| 618 | 626 | } |
| 619 | 627 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -531,40 +531,48 @@ | |
| 531 | writeln -nonewline " \\\n \$(OBJDIR)/$s.o" |
| 532 | } |
| 533 | writeln "\n" |
| 534 | writeln "APPNAME = ${name}.exe" |
| 535 | writeln { |
| 536 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 537 | # use forward slashes for correctness. If the SHELL environment variable |
| 538 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 539 | # |
| 540 | ifdef SHELL |
| 541 | TRANSLATE = $(OBJDIR)/translate |
| 542 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 543 | MKINDEX = $(OBJDIR)/mkindex |
| 544 | VERSION = $(OBJDIR)/version |
| 545 | else |
| 546 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 547 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 548 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 549 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 550 | endif} |
| 551 | |
| 552 | writeln { |
| 553 | all: $(OBJDIR) $(APPNAME) |
| 554 | |
| 555 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 556 | cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 557 | cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 558 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 559 | |
| 560 | install: $(APPNAME) |
| 561 | mkdir -p $(INSTALLDIR) |
| 562 | mv $(APPNAME) $(INSTALLDIR) |
| 563 | |
| 564 | $(OBJDIR): |
| 565 | mkdir $(OBJDIR) |
| 566 | |
| 567 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 568 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 569 | |
| 570 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -608,11 +616,11 @@ | |
| 608 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 609 | # command. "del" will not work here because it is not a separate command |
| 610 | # but a MSDOS-shell builtin. |
| 611 | # |
| 612 | clean: |
| 613 | rm -rf $(OBJDIR) $(APPNAME) |
| 614 | |
| 615 | setup: $(OBJDIR) $(APPNAME) |
| 616 | $(MAKENSIS) ./fossil.nsi |
| 617 | |
| 618 | } |
| 619 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -531,40 +531,48 @@ | |
| 531 | writeln -nonewline " \\\n \$(OBJDIR)/$s.o" |
| 532 | } |
| 533 | writeln "\n" |
| 534 | writeln "APPNAME = ${name}.exe" |
| 535 | writeln { |
| 536 | #### If the SHELL environment variable exists, it is assumed that we are |
| 537 | # building inside of a Unix-style shell; otherwise, it is assumed that |
| 538 | # we are building inside of a Windows-style shell. |
| 539 | # |
| 540 | ifdef SHELL |
| 541 | TRANSLATE = $(OBJDIR)/translate |
| 542 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 543 | MKINDEX = $(OBJDIR)/mkindex |
| 544 | VERSION = $(OBJDIR)/version |
| 545 | CP = cp |
| 546 | MV = mv |
| 547 | RM = rm -rf |
| 548 | MKDIR = mkdir -p |
| 549 | else |
| 550 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 551 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 552 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 553 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 554 | CP = copy |
| 555 | MV = move |
| 556 | RM = del /S /Q |
| 557 | MKDIR = mkdir |
| 558 | endif} |
| 559 | |
| 560 | writeln { |
| 561 | all: $(OBJDIR) $(APPNAME) |
| 562 | |
| 563 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 564 | $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 565 | $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 566 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 567 | |
| 568 | install: $(APPNAME) |
| 569 | $(MKDIR) $(INSTALLDIR) |
| 570 | $(MV) $(APPNAME) $(INSTALLDIR) |
| 571 | |
| 572 | $(OBJDIR): |
| 573 | $(MKDIR) $(OBJDIR) |
| 574 | |
| 575 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 576 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 577 | |
| 578 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -608,11 +616,11 @@ | |
| 616 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 617 | # command. "del" will not work here because it is not a separate command |
| 618 | # but a MSDOS-shell builtin. |
| 619 | # |
| 620 | clean: |
| 621 | $(RM) $(OBJDIR) $(APPNAME) |
| 622 | |
| 623 | setup: $(OBJDIR) $(APPNAME) |
| 624 | $(MAKENSIS) ./fossil.nsi |
| 625 | |
| 626 | } |
| 627 |
+17
-9
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -495,39 +495,47 @@ | ||
| 495 | 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | 496 | $(OBJDIR)/zip.o |
| 497 | 497 | |
| 498 | 498 | APPNAME = fossil.exe |
| 499 | 499 | |
| 500 | -#### Attempt to determine if this is the actual MSYS shell. If so, we need to | |
| 501 | -# use forward slashes for correctness. If the SHELL environment variable | |
| 502 | -# exists, it is assumed that we are building inside of a Unix-style shell. | |
| 500 | +#### If the SHELL environment variable exists, it is assumed that we are | |
| 501 | +# building inside of a Unix-style shell; otherwise, it is assumed that | |
| 502 | +# we are building inside of a Windows-style shell. | |
| 503 | 503 | # |
| 504 | 504 | ifdef SHELL |
| 505 | 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | 508 | VERSION = $(OBJDIR)/version |
| 509 | +CP = cp | |
| 510 | +MV = mv | |
| 511 | +RM = rm -rf | |
| 512 | +MKDIR = mkdir -p | |
| 509 | 513 | else |
| 510 | 514 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 511 | 515 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 512 | 516 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 513 | 517 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 518 | +CP = copy | |
| 519 | +MV = move | |
| 520 | +RM = del /S /Q | |
| 521 | +MKDIR = mkdir | |
| 514 | 522 | endif |
| 515 | 523 | |
| 516 | 524 | all: $(OBJDIR) $(APPNAME) |
| 517 | 525 | |
| 518 | 526 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 519 | - cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 520 | - cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 527 | + $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 528 | + $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 521 | 529 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 522 | 530 | |
| 523 | 531 | install: $(APPNAME) |
| 524 | - mkdir -p $(INSTALLDIR) | |
| 525 | - mv $(APPNAME) $(INSTALLDIR) | |
| 532 | + $(MKDIR) $(INSTALLDIR) | |
| 533 | + $(MV) $(APPNAME) $(INSTALLDIR) | |
| 526 | 534 | |
| 527 | 535 | $(OBJDIR): |
| 528 | - mkdir $(OBJDIR) | |
| 536 | + $(MKDIR) $(OBJDIR) | |
| 529 | 537 | |
| 530 | 538 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 531 | 539 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 532 | 540 | |
| 533 | 541 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | ||
| 566 | 574 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 567 | 575 | # command. "del" will not work here because it is not a separate command |
| 568 | 576 | # but a MSDOS-shell builtin. |
| 569 | 577 | # |
| 570 | 578 | clean: |
| 571 | - rm -rf $(OBJDIR) $(APPNAME) | |
| 579 | + $(RM) $(OBJDIR) $(APPNAME) | |
| 572 | 580 | |
| 573 | 581 | setup: $(OBJDIR) $(APPNAME) |
| 574 | 582 | $(MAKENSIS) ./fossil.nsi |
| 575 | 583 | |
| 576 | 584 | |
| 577 | 585 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -495,39 +495,47 @@ | |
| 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | $(OBJDIR)/zip.o |
| 497 | |
| 498 | APPNAME = fossil.exe |
| 499 | |
| 500 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 501 | # use forward slashes for correctness. If the SHELL environment variable |
| 502 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | VERSION = $(OBJDIR)/version |
| 509 | else |
| 510 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 511 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 512 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 513 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 514 | endif |
| 515 | |
| 516 | all: $(OBJDIR) $(APPNAME) |
| 517 | |
| 518 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 519 | cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 520 | cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 521 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 522 | |
| 523 | install: $(APPNAME) |
| 524 | mkdir -p $(INSTALLDIR) |
| 525 | mv $(APPNAME) $(INSTALLDIR) |
| 526 | |
| 527 | $(OBJDIR): |
| 528 | mkdir $(OBJDIR) |
| 529 | |
| 530 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 531 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 532 | |
| 533 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | |
| 566 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 567 | # command. "del" will not work here because it is not a separate command |
| 568 | # but a MSDOS-shell builtin. |
| 569 | # |
| 570 | clean: |
| 571 | rm -rf $(OBJDIR) $(APPNAME) |
| 572 | |
| 573 | setup: $(OBJDIR) $(APPNAME) |
| 574 | $(MAKENSIS) ./fossil.nsi |
| 575 | |
| 576 | |
| 577 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -495,39 +495,47 @@ | |
| 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | $(OBJDIR)/zip.o |
| 497 | |
| 498 | APPNAME = fossil.exe |
| 499 | |
| 500 | #### If the SHELL environment variable exists, it is assumed that we are |
| 501 | # building inside of a Unix-style shell; otherwise, it is assumed that |
| 502 | # we are building inside of a Windows-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | VERSION = $(OBJDIR)/version |
| 509 | CP = cp |
| 510 | MV = mv |
| 511 | RM = rm -rf |
| 512 | MKDIR = mkdir -p |
| 513 | else |
| 514 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 515 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 516 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 517 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 518 | CP = copy |
| 519 | MV = move |
| 520 | RM = del /S /Q |
| 521 | MKDIR = mkdir |
| 522 | endif |
| 523 | |
| 524 | all: $(OBJDIR) $(APPNAME) |
| 525 | |
| 526 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 527 | $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 528 | $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 529 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 530 | |
| 531 | install: $(APPNAME) |
| 532 | $(MKDIR) $(INSTALLDIR) |
| 533 | $(MV) $(APPNAME) $(INSTALLDIR) |
| 534 | |
| 535 | $(OBJDIR): |
| 536 | $(MKDIR) $(OBJDIR) |
| 537 | |
| 538 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 539 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 540 | |
| 541 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | |
| 574 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 575 | # command. "del" will not work here because it is not a separate command |
| 576 | # but a MSDOS-shell builtin. |
| 577 | # |
| 578 | clean: |
| 579 | $(RM) $(OBJDIR) $(APPNAME) |
| 580 | |
| 581 | setup: $(OBJDIR) $(APPNAME) |
| 582 | $(MAKENSIS) ./fossil.nsi |
| 583 | |
| 584 | |
| 585 |
+17
-9
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -495,39 +495,47 @@ | ||
| 495 | 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | 496 | $(OBJDIR)/zip.o |
| 497 | 497 | |
| 498 | 498 | APPNAME = fossil.exe |
| 499 | 499 | |
| 500 | -#### Attempt to determine if this is the actual MSYS shell. If so, we need to | |
| 501 | -# use forward slashes for correctness. If the SHELL environment variable | |
| 502 | -# exists, it is assumed that we are building inside of a Unix-style shell. | |
| 500 | +#### If the SHELL environment variable exists, it is assumed that we are | |
| 501 | +# building inside of a Unix-style shell; otherwise, it is assumed that | |
| 502 | +# we are building inside of a Windows-style shell. | |
| 503 | 503 | # |
| 504 | 504 | ifdef SHELL |
| 505 | 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | 508 | VERSION = $(OBJDIR)/version |
| 509 | +CP = cp | |
| 510 | +MV = mv | |
| 511 | +RM = rm -rf | |
| 512 | +MKDIR = mkdir -p | |
| 509 | 513 | else |
| 510 | 514 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 511 | 515 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 512 | 516 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 513 | 517 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 518 | +CP = copy | |
| 519 | +MV = move | |
| 520 | +RM = del /S /Q | |
| 521 | +MKDIR = mkdir | |
| 514 | 522 | endif |
| 515 | 523 | |
| 516 | 524 | all: $(OBJDIR) $(APPNAME) |
| 517 | 525 | |
| 518 | 526 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 519 | - cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 520 | - cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 527 | + $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) | |
| 528 | + $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) | |
| 521 | 529 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 522 | 530 | |
| 523 | 531 | install: $(APPNAME) |
| 524 | - mkdir -p $(INSTALLDIR) | |
| 525 | - mv $(APPNAME) $(INSTALLDIR) | |
| 532 | + $(MKDIR) $(INSTALLDIR) | |
| 533 | + $(MV) $(APPNAME) $(INSTALLDIR) | |
| 526 | 534 | |
| 527 | 535 | $(OBJDIR): |
| 528 | - mkdir $(OBJDIR) | |
| 536 | + $(MKDIR) $(OBJDIR) | |
| 529 | 537 | |
| 530 | 538 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 531 | 539 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 532 | 540 | |
| 533 | 541 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | ||
| 566 | 574 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 567 | 575 | # command. "del" will not work here because it is not a separate command |
| 568 | 576 | # but a MSDOS-shell builtin. |
| 569 | 577 | # |
| 570 | 578 | clean: |
| 571 | - rm -rf $(OBJDIR) $(APPNAME) | |
| 579 | + $(RM) $(OBJDIR) $(APPNAME) | |
| 572 | 580 | |
| 573 | 581 | setup: $(OBJDIR) $(APPNAME) |
| 574 | 582 | $(MAKENSIS) ./fossil.nsi |
| 575 | 583 | |
| 576 | 584 | |
| 577 | 585 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -495,39 +495,47 @@ | |
| 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | $(OBJDIR)/zip.o |
| 497 | |
| 498 | APPNAME = fossil.exe |
| 499 | |
| 500 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 501 | # use forward slashes for correctness. If the SHELL environment variable |
| 502 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | VERSION = $(OBJDIR)/version |
| 509 | else |
| 510 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 511 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 512 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 513 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 514 | endif |
| 515 | |
| 516 | all: $(OBJDIR) $(APPNAME) |
| 517 | |
| 518 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 519 | cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 520 | cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 521 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 522 | |
| 523 | install: $(APPNAME) |
| 524 | mkdir -p $(INSTALLDIR) |
| 525 | mv $(APPNAME) $(INSTALLDIR) |
| 526 | |
| 527 | $(OBJDIR): |
| 528 | mkdir $(OBJDIR) |
| 529 | |
| 530 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 531 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 532 | |
| 533 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | |
| 566 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 567 | # command. "del" will not work here because it is not a separate command |
| 568 | # but a MSDOS-shell builtin. |
| 569 | # |
| 570 | clean: |
| 571 | rm -rf $(OBJDIR) $(APPNAME) |
| 572 | |
| 573 | setup: $(OBJDIR) $(APPNAME) |
| 574 | $(MAKENSIS) ./fossil.nsi |
| 575 | |
| 576 | |
| 577 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -495,39 +495,47 @@ | |
| 495 | $(OBJDIR)/xfersetup.o \ |
| 496 | $(OBJDIR)/zip.o |
| 497 | |
| 498 | APPNAME = fossil.exe |
| 499 | |
| 500 | #### If the SHELL environment variable exists, it is assumed that we are |
| 501 | # building inside of a Unix-style shell; otherwise, it is assumed that |
| 502 | # we are building inside of a Windows-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | VERSION = $(OBJDIR)/version |
| 509 | CP = cp |
| 510 | MV = mv |
| 511 | RM = rm -rf |
| 512 | MKDIR = mkdir -p |
| 513 | else |
| 514 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate) |
| 515 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders) |
| 516 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex) |
| 517 | VERSION = $(subst /,\\,$(OBJDIR)/version) |
| 518 | CP = copy |
| 519 | MV = move |
| 520 | RM = del /S /Q |
| 521 | MKDIR = mkdir |
| 522 | endif |
| 523 | |
| 524 | all: $(OBJDIR) $(APPNAME) |
| 525 | |
| 526 | $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h |
| 527 | $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR) |
| 528 | $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR) |
| 529 | $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o |
| 530 | |
| 531 | install: $(APPNAME) |
| 532 | $(MKDIR) $(INSTALLDIR) |
| 533 | $(MV) $(APPNAME) $(INSTALLDIR) |
| 534 | |
| 535 | $(OBJDIR): |
| 536 | $(MKDIR) $(OBJDIR) |
| 537 | |
| 538 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 539 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 540 | |
| 541 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| @@ -566,11 +574,11 @@ | |
| 574 | # Requires MSYS to be installed in addition to the MinGW, for the "rm" |
| 575 | # command. "del" will not work here because it is not a separate command |
| 576 | # but a MSDOS-shell builtin. |
| 577 | # |
| 578 | clean: |
| 579 | $(RM) $(OBJDIR) $(APPNAME) |
| 580 | |
| 581 | setup: $(OBJDIR) $(APPNAME) |
| 582 | $(MAKENSIS) ./fossil.nsi |
| 583 | |
| 584 | |
| 585 |