Fossil SCM
In the MSVC makefile, do not wrap '$(MAKE)' in double quotes because it already has them.
Commit
ba0f0b7c9cddd3c4874d0afe8bb04f507667c5d80b64e08be4d0b9362be51df4
Parent
0387226c38e3630…
2 files changed
+3
-4
+3
-4
+3
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1861,18 +1861,17 @@ | ||
| 1861 | 1861 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 1862 | 1862 | !else |
| 1863 | 1863 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 1864 | 1864 | !endif |
| 1865 | 1865 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 1866 | - @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd | |
| 1866 | + @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd | |
| 1867 | 1867 | !else |
| 1868 | - @pushd "$(SSLDIR)" && "$(MAKE)" && popd | |
| 1868 | + @pushd "$(SSLDIR)" && $(MAKE) && popd | |
| 1869 | 1869 | !endif |
| 1870 | 1870 | |
| 1871 | 1871 | clean-openssl: |
| 1872 | - @pushd "$(SSLDIR)" && "$(MAKE)" clean && popd | |
| 1873 | - | |
| 1872 | + @pushd "$(SSLDIR)" && $(MAKE) clean && popd | |
| 1874 | 1873 | !endif |
| 1875 | 1874 | |
| 1876 | 1875 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 1877 | 1876 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 1878 | 1877 | APPTARGETS = $(APPTARGETS) zlib |
| 1879 | 1878 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1861,18 +1861,17 @@ | |
| 1861 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 1862 | !else |
| 1863 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 1864 | !endif |
| 1865 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 1866 | @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd |
| 1867 | !else |
| 1868 | @pushd "$(SSLDIR)" && "$(MAKE)" && popd |
| 1869 | !endif |
| 1870 | |
| 1871 | clean-openssl: |
| 1872 | @pushd "$(SSLDIR)" && "$(MAKE)" clean && popd |
| 1873 | |
| 1874 | !endif |
| 1875 | |
| 1876 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 1877 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 1878 | APPTARGETS = $(APPTARGETS) zlib |
| 1879 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1861,18 +1861,17 @@ | |
| 1861 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 1862 | !else |
| 1863 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 1864 | !endif |
| 1865 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 1866 | @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd |
| 1867 | !else |
| 1868 | @pushd "$(SSLDIR)" && $(MAKE) && popd |
| 1869 | !endif |
| 1870 | |
| 1871 | clean-openssl: |
| 1872 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 1873 | !endif |
| 1874 | |
| 1875 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 1876 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 1877 | APPTARGETS = $(APPTARGETS) zlib |
| 1878 |
+3
-4
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -797,18 +797,17 @@ | ||
| 797 | 797 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 798 | 798 | !else |
| 799 | 799 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 800 | 800 | !endif |
| 801 | 801 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 802 | - @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd | |
| 802 | + @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd | |
| 803 | 803 | !else |
| 804 | - @pushd "$(SSLDIR)" && "$(MAKE)" && popd | |
| 804 | + @pushd "$(SSLDIR)" && $(MAKE) && popd | |
| 805 | 805 | !endif |
| 806 | 806 | |
| 807 | 807 | clean-openssl: |
| 808 | - @pushd "$(SSLDIR)" && "$(MAKE)" clean && popd | |
| 809 | - | |
| 808 | + @pushd "$(SSLDIR)" && $(MAKE) clean && popd | |
| 810 | 809 | !endif |
| 811 | 810 | |
| 812 | 811 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 813 | 812 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 814 | 813 | APPTARGETS = $(APPTARGETS) zlib |
| 815 | 814 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -797,18 +797,17 @@ | |
| 797 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 798 | !else |
| 799 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 800 | !endif |
| 801 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 802 | @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd |
| 803 | !else |
| 804 | @pushd "$(SSLDIR)" && "$(MAKE)" && popd |
| 805 | !endif |
| 806 | |
| 807 | clean-openssl: |
| 808 | @pushd "$(SSLDIR)" && "$(MAKE)" clean && popd |
| 809 | |
| 810 | !endif |
| 811 | |
| 812 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 813 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 814 | APPTARGETS = $(APPTARGETS) zlib |
| 815 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -797,18 +797,17 @@ | |
| 797 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 798 | !else |
| 799 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 800 | !endif |
| 801 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 802 | @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd |
| 803 | !else |
| 804 | @pushd "$(SSLDIR)" && $(MAKE) && popd |
| 805 | !endif |
| 806 | |
| 807 | clean-openssl: |
| 808 | @pushd "$(SSLDIR)" && $(MAKE) clean && popd |
| 809 | !endif |
| 810 | |
| 811 | !if $(FOSSIL_ENABLE_MINIZ)==0 |
| 812 | !if $(FOSSIL_BUILD_ZLIB)!=0 |
| 813 | APPTARGETS = $(APPTARGETS) zlib |
| 814 |