diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-12-07 07:55:05 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-12-07 07:55:05 -0600 |
| commit | 1988b8f65e4bfa2c9fb1fa13316f3c22ec59d298 (patch) | |
| tree | f27569fb259eca41fdda222fdaa919485b750e31 /tls | |
| parent | 905e2a3b8046e227bf02410def56b0c2535de14f (diff) | |
| download | portable-1988b8f65e4bfa2c9fb1fa13316f3c22ec59d298.tar.gz portable-1988b8f65e4bfa2c9fb1fa13316f3c22ec59d298.tar.bz2 portable-1988b8f65e4bfa2c9fb1fa13316f3c22ec59d298.zip | |
fixup cert.pem path override for libtls, add for nc(1)
this also fixes the formatting of help for nc(1)
Diffstat (limited to 'tls')
| -rw-r--r-- | tls/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tls/Makefile.am b/tls/Makefile.am index 2d033fd..b19c881 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
| @@ -10,9 +10,9 @@ libtls_la_LIBADD = ../crypto/libcrypto.la ../ssl/libssl.la $(PLATFORM_LDADD) | |||
| 10 | 10 | ||
| 11 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) | 11 | libtls_la_CPPFLAGS = $(AM_CPPFLAGS) |
| 12 | if OPENSSLDIR_DEFINED | 12 | if OPENSSLDIR_DEFINED |
| 13 | libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"@OPENSSLDIR@\" | 13 | libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"@OPENSSLDIR@/cert.pem\" |
| 14 | else | 14 | else |
| 15 | libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(sysconfdir)/ssl\" | 15 | libtls_la_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" |
| 16 | endif | 16 | endif |
| 17 | 17 | ||
| 18 | libtls_la_SOURCES = tls.c | 18 | libtls_la_SOURCES = tls.c |