Fossil SCM

Another minor simplification to the MSVC makefile.

mistachkin 2020-06-09 00:59 trunk
Commit 0387226c38e36305a814fe4bef2df5669dbbf96001265101d31931cd12fe9b5f
Parent 84346a317b77041…
2 files changed +7 -4 +7 -4
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+7 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1509,11 +1509,14 @@
15091509
 !endif
15101510
15111511
 # Perl is only necessary if OpenSSL support is enabled and it must
15121512
 # be built from source code. The PERLDIR variable should point to
15131513
 # the directory containing the main Perl binary (i.e. "perl.exe").
1514
+!ifndef PERLDIR
15141515
 PERLDIR = C:\Perl\bin
1516
+!endif
1517
+
15151518
 PERL = perl.exe
15161519
15171520
 # Enable debugging symbols?
15181521
 !ifndef DEBUG
15191522
 DEBUG = 0
@@ -1849,18 +1852,18 @@
18491852
 !endif
18501853
18511854
 clean-zlib:
18521855
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
18531856
1854
-
18551857
 !if $(FOSSIL_ENABLE_SSL)!=0
18561858
 openssl:
18571859
 @echo Building OpenSSL from "$(SSLDIR)"...
1858
-!if "$(PERLDIR)" != ""
1859
- @set "PATH=$(PERLDIR);$(PATH)"
1860
-!endif
1860
+!ifdef PERLDIR
1861
+ @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1862
+!else
18611863
 @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1864
+!endif
18621865
 !if $(FOSSIL_ENABLE_WINXP)!=0
18631866
 @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
18641867
 !else
18651868
 @pushd "$(SSLDIR)" && "$(MAKE)" && popd
18661869
 !endif
18671870
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1509,11 +1509,14 @@
1509 !endif
1510
1511 # Perl is only necessary if OpenSSL support is enabled and it must
1512 # be built from source code. The PERLDIR variable should point to
1513 # the directory containing the main Perl binary (i.e. "perl.exe").
 
1514 PERLDIR = C:\Perl\bin
 
 
1515 PERL = perl.exe
1516
1517 # Enable debugging symbols?
1518 !ifndef DEBUG
1519 DEBUG = 0
@@ -1849,18 +1852,18 @@
1849 !endif
1850
1851 clean-zlib:
1852 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1853
1854
1855 !if $(FOSSIL_ENABLE_SSL)!=0
1856 openssl:
1857 @echo Building OpenSSL from "$(SSLDIR)"...
1858 !if "$(PERLDIR)" != ""
1859 @set "PATH=$(PERLDIR);$(PATH)"
1860 !endif
1861 @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
 
1862 !if $(FOSSIL_ENABLE_WINXP)!=0
1863 @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1864 !else
1865 @pushd "$(SSLDIR)" && "$(MAKE)" && popd
1866 !endif
1867
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1509,11 +1509,14 @@
1509 !endif
1510
1511 # Perl is only necessary if OpenSSL support is enabled and it must
1512 # be built from source code. The PERLDIR variable should point to
1513 # the directory containing the main Perl binary (i.e. "perl.exe").
1514 !ifndef PERLDIR
1515 PERLDIR = C:\Perl\bin
1516 !endif
1517
1518 PERL = perl.exe
1519
1520 # Enable debugging symbols?
1521 !ifndef DEBUG
1522 DEBUG = 0
@@ -1849,18 +1852,18 @@
1852 !endif
1853
1854 clean-zlib:
1855 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1856
 
1857 !if $(FOSSIL_ENABLE_SSL)!=0
1858 openssl:
1859 @echo Building OpenSSL from "$(SSLDIR)"...
1860 !ifdef PERLDIR
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
M win/Makefile.msc
+7 -4
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -34,11 +34,14 @@
3434
 !endif
3535
3636
 # Perl is only necessary if OpenSSL support is enabled and it must
3737
 # be built from source code. The PERLDIR variable should point to
3838
 # the directory containing the main Perl binary (i.e. "perl.exe").
39
+!ifndef PERLDIR
3940
 PERLDIR = C:\Perl\bin
41
+!endif
42
+
4043
 PERL = perl.exe
4144
4245
 # Enable debugging symbols?
4346
 !ifndef DEBUG
4447
 DEBUG = 0
@@ -785,18 +788,18 @@
785788
 !endif
786789
787790
 clean-zlib:
788791
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
789792
790
-
791793
 !if $(FOSSIL_ENABLE_SSL)!=0
792794
 openssl:
793795
 @echo Building OpenSSL from "$(SSLDIR)"...
794
-!if "$(PERLDIR)" != ""
795
- @set "PATH=$(PERLDIR);$(PATH)"
796
-!endif
796
+!ifdef PERLDIR
797
+ @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
798
+!else
797799
 @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
800
+!endif
798801
 !if $(FOSSIL_ENABLE_WINXP)!=0
799802
 @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
800803
 !else
801804
 @pushd "$(SSLDIR)" && "$(MAKE)" && popd
802805
 !endif
803806
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -34,11 +34,14 @@
34 !endif
35
36 # Perl is only necessary if OpenSSL support is enabled and it must
37 # be built from source code. The PERLDIR variable should point to
38 # the directory containing the main Perl binary (i.e. "perl.exe").
 
39 PERLDIR = C:\Perl\bin
 
 
40 PERL = perl.exe
41
42 # Enable debugging symbols?
43 !ifndef DEBUG
44 DEBUG = 0
@@ -785,18 +788,18 @@
785 !endif
786
787 clean-zlib:
788 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
789
790
791 !if $(FOSSIL_ENABLE_SSL)!=0
792 openssl:
793 @echo Building OpenSSL from "$(SSLDIR)"...
794 !if "$(PERLDIR)" != ""
795 @set "PATH=$(PERLDIR);$(PATH)"
796 !endif
797 @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
 
798 !if $(FOSSIL_ENABLE_WINXP)!=0
799 @pushd "$(SSLDIR)" && "$(MAKE)" "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
800 !else
801 @pushd "$(SSLDIR)" && "$(MAKE)" && popd
802 !endif
803
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -34,11 +34,14 @@
34 !endif
35
36 # Perl is only necessary if OpenSSL support is enabled and it must
37 # be built from source code. The PERLDIR variable should point to
38 # the directory containing the main Perl binary (i.e. "perl.exe").
39 !ifndef PERLDIR
40 PERLDIR = C:\Perl\bin
41 !endif
42
43 PERL = perl.exe
44
45 # Enable debugging symbols?
46 !ifndef DEBUG
47 DEBUG = 0
@@ -785,18 +788,18 @@
788 !endif
789
790 clean-zlib:
791 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
792
 
793 !if $(FOSSIL_ENABLE_SSL)!=0
794 openssl:
795 @echo Building OpenSSL from "$(SSLDIR)"...
796 !ifdef PERLDIR
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

Keyboard Shortcuts

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