Fossil SCM
Make the MinGW makefile consistent with the MSVC one in where it attempts to locate the OpenSSL directory.
Commit
94485846c3a9c7d837a3b3b81db974088a4dbf42
Parent
1686ff716a49d4b…
3 files changed
+2
-2
+2
-2
+2
-2
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -416,12 +416,12 @@ | ||
| 416 | 416 | #### The directories where the OpenSSL include and library files are located. |
| 417 | 417 | # The recommended usage here is to use the Sysinternals junction tool |
| 418 | 418 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 419 | 419 | # Fossil source code directory and the target OpenSSL source directory. |
| 420 | 420 | # |
| 421 | -OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include | |
| 422 | -OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e | |
| 421 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include | |
| 422 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e | |
| 423 | 423 | |
| 424 | 424 | #### Either the directory where the Tcl library is installed or the Tcl |
| 425 | 425 | # source code directory resides (depending on the value of the macro |
| 426 | 426 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 427 | 427 | # this directory must have "include" and "lib" sub-directories. If |
| 428 | 428 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -416,12 +416,12 @@ | |
| 416 | #### The directories where the OpenSSL include and library files are located. |
| 417 | # The recommended usage here is to use the Sysinternals junction tool |
| 418 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 419 | # Fossil source code directory and the target OpenSSL source directory. |
| 420 | # |
| 421 | OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include |
| 422 | OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e |
| 423 | |
| 424 | #### Either the directory where the Tcl library is installed or the Tcl |
| 425 | # source code directory resides (depending on the value of the macro |
| 426 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 427 | # this directory must have "include" and "lib" sub-directories. If |
| 428 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -416,12 +416,12 @@ | |
| 416 | #### The directories where the OpenSSL include and library files are located. |
| 417 | # The recommended usage here is to use the Sysinternals junction tool |
| 418 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 419 | # Fossil source code directory and the target OpenSSL source directory. |
| 420 | # |
| 421 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include |
| 422 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e |
| 423 | |
| 424 | #### Either the directory where the Tcl library is installed or the Tcl |
| 425 | # source code directory resides (depending on the value of the macro |
| 426 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 427 | # this directory must have "include" and "lib" sub-directories. If |
| 428 |
+2
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -80,12 +80,12 @@ | ||
| 80 | 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | 84 | # |
| 85 | -OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include | |
| 86 | -OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e | |
| 85 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include | |
| 86 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e | |
| 87 | 87 | |
| 88 | 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | 89 | # source code directory resides (depending on the value of the macro |
| 90 | 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 | 92 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -80,12 +80,12 @@ | |
| 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | # |
| 85 | OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include |
| 86 | OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e |
| 87 | |
| 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | # source code directory resides (depending on the value of the macro |
| 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -80,12 +80,12 @@ | |
| 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | # |
| 85 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include |
| 86 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e |
| 87 | |
| 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | # source code directory resides (depending on the value of the macro |
| 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 |
+2
-2
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -80,12 +80,12 @@ | ||
| 80 | 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | 84 | # |
| 85 | -OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include | |
| 86 | -OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e | |
| 85 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include | |
| 86 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e | |
| 87 | 87 | |
| 88 | 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | 89 | # source code directory resides (depending on the value of the macro |
| 90 | 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 | 92 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -80,12 +80,12 @@ | |
| 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | # |
| 85 | OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1e/include |
| 86 | OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1e |
| 87 | |
| 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | # source code directory resides (depending on the value of the macro |
| 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -80,12 +80,12 @@ | |
| 80 | #### The directories where the OpenSSL include and library files are located. |
| 81 | # The recommended usage here is to use the Sysinternals junction tool |
| 82 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 83 | # Fossil source code directory and the target OpenSSL source directory. |
| 84 | # |
| 85 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1e/include |
| 86 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1e |
| 87 | |
| 88 | #### Either the directory where the Tcl library is installed or the Tcl |
| 89 | # source code directory resides (depending on the value of the macro |
| 90 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 91 | # this directory must have "include" and "lib" sub-directories. If |
| 92 |