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 /apps/nc | |
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 'apps/nc')
-rw-r--r-- | apps/nc/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index cfcdab1..564080c 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am | |||
@@ -12,6 +12,11 @@ nc_LDADD += $(top_builddir)/ssl/libssl.la | |||
12 | nc_LDADD += $(top_builddir)/tls/libtls.la | 12 | nc_LDADD += $(top_builddir)/tls/libtls.la |
13 | 13 | ||
14 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 14 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat |
15 | if OPENSSLDIR_DEFINED | ||
16 | AM_CPPFLAGS += -DDEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\" | ||
17 | else | ||
18 | AM_CPPFLAGS += -DDEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\" | ||
19 | endif | ||
15 | 20 | ||
16 | nc_SOURCES = atomicio.c | 21 | nc_SOURCES = atomicio.c |
17 | nc_SOURCES += netcat.c | 22 | nc_SOURCES += netcat.c |