0703d4dc5aa… — Fossil SCM

M src/makemake.tcl

+2 -5

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -713,15 +713,12 @@
713	713	ifndef FOSSIL_ENABLE_MINIZ
714	714	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
715	715	endif
716	716
717	717	#### The directories where the OpenSSL include and library files are located.
718		-# The recommended usage here is to use the Sysinternals junction tool
719		-# to create a hard link between an "openssl-1.x" sub-directory of the
720		-# Fossil source code directory and the target OpenSSL source directory.
721	718	#
722		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
	719	+OPENSSLDIR = $(SRCDIR)/../compat/openssl
723	720	OPENSSLINCDIR = $(OPENSSLDIR)/include
724	721	OPENSSLLIBDIR = $(OPENSSLDIR)
725	722
726	723	#### Either the directory where the Tcl library is installed or the Tcl
727	724	# source code directory resides (depending on the value of the macro
		@@ -1563,11 +1560,11 @@
1563	1560	!ifndef USE_SEE
1564	1561	USE_SEE = 0
1565	1562	!endif
1566	1563
1567	1564	!if $(FOSSIL_ENABLE_SSL)!=0
1568		-SSLDIR = $(B)\compat\openssl-1.1.1g
	1565	+SSLDIR = $(B)\compat\openssl
1569	1566	SSLINCDIR = $(SSLDIR)\include
1570	1567	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1571	1568	SSLLIBDIR = $(SSLDIR)
1572	1569	!else
1573	1570	SSLLIBDIR = $(SSLDIR)
1574	1571

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -713,15 +713,12 @@
713	ifndef FOSSIL_ENABLE_MINIZ
714	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
715	endif
716
717	#### The directories where the OpenSSL include and library files are located.
718	# The recommended usage here is to use the Sysinternals junction tool
719	# to create a hard link between an "openssl-1.x" sub-directory of the
720	# Fossil source code directory and the target OpenSSL source directory.
721	#
722	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
723	OPENSSLINCDIR = $(OPENSSLDIR)/include
724	OPENSSLLIBDIR = $(OPENSSLDIR)
725
726	#### Either the directory where the Tcl library is installed or the Tcl
727	# source code directory resides (depending on the value of the macro
	@@ -1563,11 +1560,11 @@
1563	!ifndef USE_SEE
1564	USE_SEE = 0
1565	!endif
1566
1567	!if $(FOSSIL_ENABLE_SSL)!=0
1568	SSLDIR = $(B)\compat\openssl-1.1.1g
1569	SSLINCDIR = $(SSLDIR)\include
1570	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1571	SSLLIBDIR = $(SSLDIR)
1572	!else
1573	SSLLIBDIR = $(SSLDIR)
1574

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -713,15 +713,12 @@
713	ifndef FOSSIL_ENABLE_MINIZ
714	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
715	endif
716
717	#### The directories where the OpenSSL include and library files are located.



718	#
719	OPENSSLDIR = $(SRCDIR)/../compat/openssl
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
	@@ -1563,11 +1560,11 @@
1560	!ifndef USE_SEE
1561	USE_SEE = 0
1562	!endif
1563
1564	!if $(FOSSIL_ENABLE_SSL)!=0
1565	SSLDIR = $(B)\compat\openssl
1566	SSLINCDIR = $(SSLDIR)\include
1567	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1568	SSLLIBDIR = $(SSLDIR)
1569	!else
1570	SSLLIBDIR = $(SSLDIR)
1571

M win/Makefile.mingw

+1 -4

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -166,15 +166,12 @@
166	166	ifndef FOSSIL_ENABLE_MINIZ
167	167	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
168	168	endif
169	169
170	170	#### The directories where the OpenSSL include and library files are located.
171		-# The recommended usage here is to use the Sysinternals junction tool
172		-# to create a hard link between an "openssl-1.x" sub-directory of the
173		-# Fossil source code directory and the target OpenSSL source directory.
174	171	#
175		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
	172	+OPENSSLDIR = $(SRCDIR)/../compat/openssl
176	173	OPENSSLINCDIR = $(OPENSSLDIR)/include
177	174	OPENSSLLIBDIR = $(OPENSSLDIR)
178	175
179	176	#### Either the directory where the Tcl library is installed or the Tcl
180	177	# source code directory resides (depending on the value of the macro
181	178

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -166,15 +166,12 @@
166	ifndef FOSSIL_ENABLE_MINIZ
167	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
168	endif
169
170	#### The directories where the OpenSSL include and library files are located.
171	# The recommended usage here is to use the Sysinternals junction tool
172	# to create a hard link between an "openssl-1.x" sub-directory of the
173	# Fossil source code directory and the target OpenSSL source directory.
174	#
175	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1g
176	OPENSSLINCDIR = $(OPENSSLDIR)/include
177	OPENSSLLIBDIR = $(OPENSSLDIR)
178
179	#### Either the directory where the Tcl library is installed or the Tcl
180	# source code directory resides (depending on the value of the macro
181

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -166,15 +166,12 @@
166	ifndef FOSSIL_ENABLE_MINIZ
167	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
168	endif
169
170	#### The directories where the OpenSSL include and library files are located.



171	#
172	OPENSSLDIR = $(SRCDIR)/../compat/openssl
173	OPENSSLINCDIR = $(OPENSSLDIR)/include
174	OPENSSLLIBDIR = $(OPENSSLDIR)
175
176	#### Either the directory where the Tcl library is installed or the Tcl
177	# source code directory resides (depending on the value of the macro
178

M win/Makefile.msc

+1 -1

Fossil SCM