Fossil SCM
Make it easier to override the directory for OpenSSL when compiling with MinGW.
Commit
af8c8c67af751211598f7f849763edc6dad72c80
Parent
ac36755f3161d5c…
3 files changed
+3
-2
+3
-2
+3
-2
+3
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -573,12 +573,13 @@ | ||
| 573 | 573 | #### The directories where the OpenSSL include and library files are located. |
| 574 | 574 | # The recommended usage here is to use the Sysinternals junction tool |
| 575 | 575 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 576 | 576 | # Fossil source code directory and the target OpenSSL source directory. |
| 577 | 577 | # |
| 578 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include | |
| 579 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 578 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 579 | +OPENSSLINCDIR = $(OPENSSLDIR)/include | |
| 580 | +OPENSSLLIBDIR = $(OPENSSLDIR) | |
| 580 | 581 | |
| 581 | 582 | #### Either the directory where the Tcl library is installed or the Tcl |
| 582 | 583 | # source code directory resides (depending on the value of the macro |
| 583 | 584 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 584 | 585 | # this directory must have "include" and "lib" sub-directories. If |
| 585 | 586 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -573,12 +573,13 @@ | |
| 573 | #### The directories where the OpenSSL include and library files are located. |
| 574 | # The recommended usage here is to use the Sysinternals junction tool |
| 575 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 576 | # Fossil source code directory and the target OpenSSL source directory. |
| 577 | # |
| 578 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include |
| 579 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 580 | |
| 581 | #### Either the directory where the Tcl library is installed or the Tcl |
| 582 | # source code directory resides (depending on the value of the macro |
| 583 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 584 | # this directory must have "include" and "lib" sub-directories. If |
| 585 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -573,12 +573,13 @@ | |
| 573 | #### The directories where the OpenSSL include and library files are located. |
| 574 | # The recommended usage here is to use the Sysinternals junction tool |
| 575 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 576 | # Fossil source code directory and the target OpenSSL source directory. |
| 577 | # |
| 578 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 579 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 580 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 581 | |
| 582 | #### Either the directory where the Tcl library is installed or the Tcl |
| 583 | # source code directory resides (depending on the value of the macro |
| 584 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 585 | # this directory must have "include" and "lib" sub-directories. If |
| 586 |
+3
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -146,12 +146,13 @@ | ||
| 146 | 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | 150 | # |
| 151 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include | |
| 152 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 151 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 152 | +OPENSSLINCDIR = $(OPENSSLDIR)/include | |
| 153 | +OPENSSLLIBDIR = $(OPENSSLDIR) | |
| 153 | 154 | |
| 154 | 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 155 | 156 | # source code directory resides (depending on the value of the macro |
| 156 | 157 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 157 | 158 | # this directory must have "include" and "lib" sub-directories. If |
| 158 | 159 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -146,12 +146,13 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include |
| 152 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 153 | |
| 154 | #### Either the directory where the Tcl library is installed or the Tcl |
| 155 | # source code directory resides (depending on the value of the macro |
| 156 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 157 | # this directory must have "include" and "lib" sub-directories. If |
| 158 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -146,12 +146,13 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 158 | # this directory must have "include" and "lib" sub-directories. If |
| 159 |
+3
-2
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -146,12 +146,13 @@ | ||
| 146 | 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | 150 | # |
| 151 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include | |
| 152 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 151 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 152 | +OPENSSLINCDIR = $(OPENSSLDIR)/include | |
| 153 | +OPENSSLLIBDIR = $(OPENSSLDIR) | |
| 153 | 154 | |
| 154 | 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 155 | 156 | # source code directory resides (depending on the value of the macro |
| 156 | 157 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 157 | 158 | # this directory must have "include" and "lib" sub-directories. If |
| 158 | 159 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -146,12 +146,13 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1l/include |
| 152 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 153 | |
| 154 | #### Either the directory where the Tcl library is installed or the Tcl |
| 155 | # source code directory resides (depending on the value of the macro |
| 156 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 157 | # this directory must have "include" and "lib" sub-directories. If |
| 158 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -146,12 +146,13 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 158 | # this directory must have "include" and "lib" sub-directories. If |
| 159 |