Fossil SCM

Update references to OpenSSL from 1.1.1f to 1.1.1g. Update custom makefile.

jan.nijtmans 2020-04-23 13:16 trunk

Commit 3510ca72aff7fa7eaf020f74bbbeec607d30123dca1e98c331c089ad5f32fa39

Parent fcc07be739ae1df…

5 files changed +2 -2 +1 -1 +14 -1 +1 -1 +1 -1

~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki

M src/makemake.tcl

+2 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -714,11 +714,11 @@
714	714	#### The directories where the OpenSSL include and library files are located.
715	715	# The recommended usage here is to use the Sysinternals junction tool
716	716	# to create a hard link between an "openssl-1.x" sub-directory of the
717	717	# Fossil source code directory and the target OpenSSL source directory.
718	718	#
719		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
	719	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
720	720	OPENSSLINCDIR = $(OPENSSLDIR)/include
721	721	OPENSSLLIBDIR = $(OPENSSLDIR)
722	722
723	723	#### Either the directory where the Tcl library is installed or the Tcl
724	724	# source code directory resides (depending on the value of the macro
		@@ -1571,11 +1571,11 @@
1571	1571	!ifndef USE_SEE
1572	1572	USE_SEE = 0
1573	1573	!endif
1574	1574
1575	1575	!if $(FOSSIL_ENABLE_SSL)!=0
1576		-SSLDIR = $(B)\compat\openssl-1.1.1f
	1576	+SSLDIR = $(B)\compat\openssl-1.1.1g
1577	1577	SSLINCDIR = $(SSLDIR)\include
1578	1578	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1579	1579	SSLLIBDIR = $(SSLDIR)
1580	1580	!else
1581	1581	SSLLIBDIR = $(SSLDIR)
1582	1582

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -714,11 +714,11 @@
714	#### The directories where the OpenSSL include and library files are located.
715	# The recommended usage here is to use the Sysinternals junction tool
716	# to create a hard link between an "openssl-1.x" sub-directory of the
717	# Fossil source code directory and the target OpenSSL source directory.
718	#
719	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
720	OPENSSLINCDIR = $(OPENSSLDIR)/include
721	OPENSSLLIBDIR = $(OPENSSLDIR)
722
723	#### Either the directory where the Tcl library is installed or the Tcl
724	# source code directory resides (depending on the value of the macro
	@@ -1571,11 +1571,11 @@
1571	!ifndef USE_SEE
1572	USE_SEE = 0
1573	!endif
1574
1575	!if $(FOSSIL_ENABLE_SSL)!=0
1576	SSLDIR = $(B)\compat\openssl-1.1.1f
1577	SSLINCDIR = $(SSLDIR)\include
1578	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1579	SSLLIBDIR = $(SSLDIR)
1580	!else
1581	SSLLIBDIR = $(SSLDIR)
1582

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -714,11 +714,11 @@
714	#### The directories where the OpenSSL include and library files are located.
715	# The recommended usage here is to use the Sysinternals junction tool
716	# to create a hard link between an "openssl-1.x" sub-directory of the
717	# Fossil source code directory and the target OpenSSL source directory.
718	#
719	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
720	OPENSSLINCDIR = $(OPENSSLDIR)/include
721	OPENSSLLIBDIR = $(OPENSSLDIR)
722
723	#### Either the directory where the Tcl library is installed or the Tcl
724	# source code directory resides (depending on the value of the macro
	@@ -1571,11 +1571,11 @@
1571	!ifndef USE_SEE
1572	USE_SEE = 0
1573	!endif
1574
1575	!if $(FOSSIL_ENABLE_SSL)!=0
1576	SSLDIR = $(B)\compat\openssl-1.1.1g
1577	SSLINCDIR = $(SSLDIR)\include
1578	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1579	SSLLIBDIR = $(SSLDIR)
1580	!else
1581	SSLLIBDIR = $(SSLDIR)
1582

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -174,11 +174,11 @@
174	174	#### The directories where the OpenSSL include and library files are located.
175	175	# The recommended usage here is to use the Sysinternals junction tool
176	176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	177	# Fossil source code directory and the target OpenSSL source directory.
178	178	#
179		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
	179	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
180	180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	181	OPENSSLLIBDIR = $(OPENSSLDIR)
182	182
183	183	#### Either the directory where the Tcl library is installed or the Tcl
184	184	# source code directory resides (depending on the value of the macro
185	185

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -174,11 +174,11 @@
174	#### The directories where the OpenSSL include and library files are located.
175	# The recommended usage here is to use the Sysinternals junction tool
176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	# Fossil source code directory and the target OpenSSL source directory.
178	#
179	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	OPENSSLLIBDIR = $(OPENSSLDIR)
182
183	#### Either the directory where the Tcl library is installed or the Tcl
184	# source code directory resides (depending on the value of the macro
185

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -174,11 +174,11 @@
174	#### The directories where the OpenSSL include and library files are located.
175	# The recommended usage here is to use the Sysinternals junction tool
176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	# Fossil source code directory and the target OpenSSL source directory.
178	#
179	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	OPENSSLLIBDIR = $(OPENSSLDIR)
182
183	#### Either the directory where the Tcl library is installed or the Tcl
184	# source code directory resides (depending on the value of the macro
185

M win/Makefile.mingw.mistachkin

+14 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -174,11 +174,11 @@
174	174	#### The directories where the OpenSSL include and library files are located.
175	175	# The recommended usage here is to use the Sysinternals junction tool
176	176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	177	# Fossil source code directory and the target OpenSSL source directory.
178	178	#
179		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
	179	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
180	180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	181	OPENSSLLIBDIR = $(OPENSSLDIR)
182	182
183	183	#### Either the directory where the Tcl library is installed or the Tcl
184	184	# source code directory resides (depending on the value of the macro
		@@ -440,10 +440,11 @@
440	440	SRC = \
441	441	$(SRCDIR)/add.c \
442	442	$(SRCDIR)/alerts.c \
443	443	$(SRCDIR)/allrepo.c \
444	444	$(SRCDIR)/attach.c \
	445	+ $(SRCDIR)/backlink.c \
445	446	$(SRCDIR)/backoffice.c \
446	447	$(SRCDIR)/bag.c \
447	448	$(SRCDIR)/bisect.c \
448	449	$(SRCDIR)/blob.c \
449	450	$(SRCDIR)/branch.c \
		@@ -633,10 +634,11 @@
633	634	$(SRCDIR)/../skins/rounded1/header.txt \
634	635	$(SRCDIR)/../skins/xekri/css.txt \
635	636	$(SRCDIR)/../skins/xekri/details.txt \
636	637	$(SRCDIR)/../skins/xekri/footer.txt \
637	638	$(SRCDIR)/../skins/xekri/header.txt \
	639	+ $(SRCDIR)/accordion.js \
638	640	$(SRCDIR)/ci_edit.js \
639	641	$(SRCDIR)/copybtn.js \
640	642	$(SRCDIR)/diff.tcl \
641	643	$(SRCDIR)/forum.js \
642	644	$(SRCDIR)/graph.js \
		@@ -671,10 +673,11 @@
671	673	TRANS_SRC = \
672	674	$(OBJDIR)/add_.c \
673	675	$(OBJDIR)/alerts_.c \
674	676	$(OBJDIR)/allrepo_.c \
675	677	$(OBJDIR)/attach_.c \
	678	+ $(OBJDIR)/backlink_.c \
676	679	$(OBJDIR)/backoffice_.c \
677	680	$(OBJDIR)/bag_.c \
678	681	$(OBJDIR)/bisect_.c \
679	682	$(OBJDIR)/blob_.c \
680	683	$(OBJDIR)/branch_.c \
		@@ -812,10 +815,11 @@
812	815	OBJ = \
813	816	$(OBJDIR)/add.o \
814	817	$(OBJDIR)/alerts.o \
815	818	$(OBJDIR)/allrepo.o \
816	819	$(OBJDIR)/attach.o \
	820	+ $(OBJDIR)/backlink.o \
817	821	$(OBJDIR)/backoffice.o \
818	822	$(OBJDIR)/bag.o \
819	823	$(OBJDIR)/bisect.o \
820	824	$(OBJDIR)/blob.o \
821	825	$(OBJDIR)/branch.o \
		@@ -1173,10 +1177,11 @@
1173	1177	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1174	1178	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1175	1179	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1176	1180	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1177	1181	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
	1182	+ $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1178	1183	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1179	1184	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1180	1185	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1181	1186	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1182	1187	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
		@@ -1348,10 +1353,18 @@
1348	1353
1349	1354	$(OBJDIR)/attach.o: $(OBJDIR)/attach_.c $(OBJDIR)/attach.h $(SRCDIR)/config.h
1350	1355	$(XTCC) -o $(OBJDIR)/attach.o -c $(OBJDIR)/attach_.c
1351	1356
1352	1357	$(OBJDIR)/attach.h: $(OBJDIR)/headers
	1358	+
	1359	+$(OBJDIR)/backlink_.c: $(SRCDIR)/backlink.c $(TRANSLATE)
	1360	+ $(TRANSLATE) $(SRCDIR)/backlink.c >$@
	1361	+
	1362	+$(OBJDIR)/backlink.o: $(OBJDIR)/backlink_.c $(OBJDIR)/backlink.h $(SRCDIR)/config.h
	1363	+ $(XTCC) -o $(OBJDIR)/backlink.o -c $(OBJDIR)/backlink_.c
	1364	+
	1365	+$(OBJDIR)/backlink.h: $(OBJDIR)/headers
1353	1366
1354	1367	$(OBJDIR)/backoffice_.c: $(SRCDIR)/backoffice.c $(TRANSLATE)
1355	1368	$(TRANSLATE) $(SRCDIR)/backoffice.c >$@
1356	1369
1357	1370	$(OBJDIR)/backoffice.o: $(OBJDIR)/backoffice_.c $(OBJDIR)/backoffice.h $(SRCDIR)/config.h
1358	1371

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -174,11 +174,11 @@
174	#### The directories where the OpenSSL include and library files are located.
175	# The recommended usage here is to use the Sysinternals junction tool
176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	# Fossil source code directory and the target OpenSSL source directory.
178	#
179	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f
180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	OPENSSLLIBDIR = $(OPENSSLDIR)
182
183	#### Either the directory where the Tcl library is installed or the Tcl
184	# source code directory resides (depending on the value of the macro
	@@ -440,10 +440,11 @@
440	SRC = \
441	$(SRCDIR)/add.c \
442	$(SRCDIR)/alerts.c \
443	$(SRCDIR)/allrepo.c \
444	$(SRCDIR)/attach.c \

445	$(SRCDIR)/backoffice.c \
446	$(SRCDIR)/bag.c \
447	$(SRCDIR)/bisect.c \
448	$(SRCDIR)/blob.c \
449	$(SRCDIR)/branch.c \
	@@ -633,10 +634,11 @@
633	$(SRCDIR)/../skins/rounded1/header.txt \
634	$(SRCDIR)/../skins/xekri/css.txt \
635	$(SRCDIR)/../skins/xekri/details.txt \
636	$(SRCDIR)/../skins/xekri/footer.txt \
637	$(SRCDIR)/../skins/xekri/header.txt \

638	$(SRCDIR)/ci_edit.js \
639	$(SRCDIR)/copybtn.js \
640	$(SRCDIR)/diff.tcl \
641	$(SRCDIR)/forum.js \
642	$(SRCDIR)/graph.js \
	@@ -671,10 +673,11 @@
671	TRANS_SRC = \
672	$(OBJDIR)/add_.c \
673	$(OBJDIR)/alerts_.c \
674	$(OBJDIR)/allrepo_.c \
675	$(OBJDIR)/attach_.c \

676	$(OBJDIR)/backoffice_.c \
677	$(OBJDIR)/bag_.c \
678	$(OBJDIR)/bisect_.c \
679	$(OBJDIR)/blob_.c \
680	$(OBJDIR)/branch_.c \
	@@ -812,10 +815,11 @@
812	OBJ = \
813	$(OBJDIR)/add.o \
814	$(OBJDIR)/alerts.o \
815	$(OBJDIR)/allrepo.o \
816	$(OBJDIR)/attach.o \

817	$(OBJDIR)/backoffice.o \
818	$(OBJDIR)/bag.o \
819	$(OBJDIR)/bisect.o \
820	$(OBJDIR)/blob.o \
821	$(OBJDIR)/branch.o \
	@@ -1173,10 +1177,11 @@
1173	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1174	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1175	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1176	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1177	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \

1178	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1179	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1180	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1181	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1182	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
	@@ -1348,10 +1353,18 @@
1348
1349	$(OBJDIR)/attach.o: $(OBJDIR)/attach_.c $(OBJDIR)/attach.h $(SRCDIR)/config.h
1350	$(XTCC) -o $(OBJDIR)/attach.o -c $(OBJDIR)/attach_.c
1351
1352	$(OBJDIR)/attach.h: $(OBJDIR)/headers








1353
1354	$(OBJDIR)/backoffice_.c: $(SRCDIR)/backoffice.c $(TRANSLATE)
1355	$(TRANSLATE) $(SRCDIR)/backoffice.c >$@
1356
1357	$(OBJDIR)/backoffice.o: $(OBJDIR)/backoffice_.c $(OBJDIR)/backoffice.h $(SRCDIR)/config.h
1358

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -174,11 +174,11 @@
174	#### The directories where the OpenSSL include and library files are located.
175	# The recommended usage here is to use the Sysinternals junction tool
176	# to create a hard link between an "openssl-1.x" sub-directory of the
177	# Fossil source code directory and the target OpenSSL source directory.
178	#
179	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
180	OPENSSLINCDIR = $(OPENSSLDIR)/include
181	OPENSSLLIBDIR = $(OPENSSLDIR)
182
183	#### Either the directory where the Tcl library is installed or the Tcl
184	# source code directory resides (depending on the value of the macro
	@@ -440,10 +440,11 @@
440	SRC = \
441	$(SRCDIR)/add.c \
442	$(SRCDIR)/alerts.c \
443	$(SRCDIR)/allrepo.c \
444	$(SRCDIR)/attach.c \
445	$(SRCDIR)/backlink.c \
446	$(SRCDIR)/backoffice.c \
447	$(SRCDIR)/bag.c \
448	$(SRCDIR)/bisect.c \
449	$(SRCDIR)/blob.c \
450	$(SRCDIR)/branch.c \
	@@ -633,10 +634,11 @@
634	$(SRCDIR)/../skins/rounded1/header.txt \
635	$(SRCDIR)/../skins/xekri/css.txt \
636	$(SRCDIR)/../skins/xekri/details.txt \
637	$(SRCDIR)/../skins/xekri/footer.txt \
638	$(SRCDIR)/../skins/xekri/header.txt \
639	$(SRCDIR)/accordion.js \
640	$(SRCDIR)/ci_edit.js \
641	$(SRCDIR)/copybtn.js \
642	$(SRCDIR)/diff.tcl \
643	$(SRCDIR)/forum.js \
644	$(SRCDIR)/graph.js \
	@@ -671,10 +673,11 @@
673	TRANS_SRC = \
674	$(OBJDIR)/add_.c \
675	$(OBJDIR)/alerts_.c \
676	$(OBJDIR)/allrepo_.c \
677	$(OBJDIR)/attach_.c \
678	$(OBJDIR)/backlink_.c \
679	$(OBJDIR)/backoffice_.c \
680	$(OBJDIR)/bag_.c \
681	$(OBJDIR)/bisect_.c \
682	$(OBJDIR)/blob_.c \
683	$(OBJDIR)/branch_.c \
	@@ -812,10 +815,11 @@
815	OBJ = \
816	$(OBJDIR)/add.o \
817	$(OBJDIR)/alerts.o \
818	$(OBJDIR)/allrepo.o \
819	$(OBJDIR)/attach.o \
820	$(OBJDIR)/backlink.o \
821	$(OBJDIR)/backoffice.o \
822	$(OBJDIR)/bag.o \
823	$(OBJDIR)/bisect.o \
824	$(OBJDIR)/blob.o \
825	$(OBJDIR)/branch.o \
	@@ -1173,10 +1177,11 @@
1177	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1178	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1179	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1180	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1181	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1182	$(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1183	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1184	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1185	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1186	$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1187	$(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
	@@ -1348,10 +1353,18 @@
1353
1354	$(OBJDIR)/attach.o: $(OBJDIR)/attach_.c $(OBJDIR)/attach.h $(SRCDIR)/config.h
1355	$(XTCC) -o $(OBJDIR)/attach.o -c $(OBJDIR)/attach_.c
1356
1357	$(OBJDIR)/attach.h: $(OBJDIR)/headers
1358
1359	$(OBJDIR)/backlink_.c: $(SRCDIR)/backlink.c $(TRANSLATE)
1360	$(TRANSLATE) $(SRCDIR)/backlink.c >$@
1361
1362	$(OBJDIR)/backlink.o: $(OBJDIR)/backlink_.c $(OBJDIR)/backlink.h $(SRCDIR)/config.h
1363	$(XTCC) -o $(OBJDIR)/backlink.o -c $(OBJDIR)/backlink_.c
1364
1365	$(OBJDIR)/backlink.h: $(OBJDIR)/headers
1366
1367	$(OBJDIR)/backoffice_.c: $(SRCDIR)/backoffice.c $(TRANSLATE)
1368	$(TRANSLATE) $(SRCDIR)/backoffice.c >$@
1369
1370	$(OBJDIR)/backoffice.o: $(OBJDIR)/backoffice_.c $(OBJDIR)/backoffice.h $(SRCDIR)/config.h
1371

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -98,11 +98,11 @@
98	98	!ifndef USE_SEE
99	99	USE_SEE = 0
100	100	!endif
101	101
102	102	!if $(FOSSIL_ENABLE_SSL)!=0
103		-SSLDIR = $(B)\compat\openssl-1.1.1f
	103	+SSLDIR = $(B)\compat\openssl-1.1.1g
104	104	SSLINCDIR = $(SSLDIR)\include
105	105	!if $(FOSSIL_DYNAMIC_BUILD)!=0
106	106	SSLLIBDIR = $(SSLDIR)
107	107	!else
108	108	SSLLIBDIR = $(SSLDIR)
109	109

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -98,11 +98,11 @@
98	!ifndef USE_SEE
99	USE_SEE = 0
100	!endif
101
102	!if $(FOSSIL_ENABLE_SSL)!=0
103	SSLDIR = $(B)\compat\openssl-1.1.1f
104	SSLINCDIR = $(SSLDIR)\include
105	!if $(FOSSIL_DYNAMIC_BUILD)!=0
106	SSLLIBDIR = $(SSLDIR)
107	!else
108	SSLLIBDIR = $(SSLDIR)
109

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -98,11 +98,11 @@
98	!ifndef USE_SEE
99	USE_SEE = 0
100	!endif
101
102	!if $(FOSSIL_ENABLE_SSL)!=0
103	SSLDIR = $(B)\compat\openssl-1.1.1g
104	SSLINCDIR = $(SSLDIR)\include
105	!if $(FOSSIL_DYNAMIC_BUILD)!=0
106	SSLLIBDIR = $(SSLDIR)
107	!else
108	SSLLIBDIR = $(SSLDIR)
109

M www/build.wiki

+1 -1

		--- www/build.wiki
		+++ www/build.wiki
		@@ -161,11 +161,11 @@
161	161	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162	162	first <a href="https://www.openssl.org/source/">download the official
163	163	source code for OpenSSL</a> and extract it to an appropriately named
164	164	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
165	165	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
166		-"<b>compat/openssl-1.1.1f</b>"), then make sure that some recent
	166	+"<b>compat/openssl-1.1.1g</b>"), then make sure that some recent
167	167	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168	168	and finally run one of the following commands:
169	169	<blockquote><pre>
170	170	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171	171	</pre></blockquote>
172	172

	--- www/build.wiki
	+++ www/build.wiki
	@@ -161,11 +161,11 @@
161	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162	first <a href="https://www.openssl.org/source/">download the official
163	source code for OpenSSL</a> and extract it to an appropriately named
164	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
165	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
166	"<b>compat/openssl-1.1.1f</b>"), then make sure that some recent
167	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168	and finally run one of the following commands:
169	<blockquote><pre>
170	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171	</pre></blockquote>
172

	--- www/build.wiki
	+++ www/build.wiki
	@@ -161,11 +161,11 @@
161	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162	first <a href="https://www.openssl.org/source/">download the official
163	source code for OpenSSL</a> and extract it to an appropriately named
164	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
165	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
166	"<b>compat/openssl-1.1.1g</b>"), then make sure that some recent
167	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168	and finally run one of the following commands:
169	<blockquote><pre>
170	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171	</pre></blockquote>
172

Fossil SCM

Keyboard Shortcuts