aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-13 07:23:04 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-13 07:23:04 -0500
commit02b7539cf55166ef65fb5503d59bc019ea0e8f49 (patch)
tree6311b1d3d50906010633fba2006ad4e094a6c5af
parent82e96d3565fb9c16b4ab9a6684d1c4b7d514212f (diff)
downloadportable-02b7539cf55166ef65fb5503d59bc019ea0e8f49.tar.gz
portable-02b7539cf55166ef65fb5503d59bc019ea0e8f49.tar.bz2
portable-02b7539cf55166ef65fb5503d59bc019ea0e8f49.zip
readd openssl.1, distribute nc.1
-rw-r--r--apps/nc/Makefile.am2
-rw-r--r--apps/openssl/Makefile.am2
-rwxr-xr-xupdate.sh2
3 files changed, 6 insertions, 0 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index b27d7de..916681b 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -6,6 +6,8 @@ if HAVE_POLL
6 6
7noinst_PROGRAMS = nc 7noinst_PROGRAMS = nc
8 8
9EXTRA_DIST = nc.1
10
9nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 11nc_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
10nc_LDADD += $(top_builddir)/tls/libtls.la 12nc_LDADD += $(top_builddir)/tls/libtls.la
11 13
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 9c763e1..5a8d458 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/Makefile.am.common
2 2
3bin_PROGRAMS = openssl 3bin_PROGRAMS = openssl
4 4
5dist_man_MANS = openssl.1
6
5openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) 7openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
6openssl_LDADD += $(top_builddir)/ssl/libssl.la 8openssl_LDADD += $(top_builddir)/ssl/libssl.la
7openssl_LDADD += $(top_builddir)/crypto/libcrypto.la 9openssl_LDADD += $(top_builddir)/crypto/libcrypto.la
diff --git a/update.sh b/update.sh
index f4aa70a..d3e2d21 100755
--- a/update.sh
+++ b/update.sh
@@ -212,6 +212,7 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
212 212
213# copy nc(1) source 213# copy nc(1) source
214echo "copying nc(1) source" 214echo "copying nc(1) source"
215$CP $app_src/nc/nc.1 apps/nc
215rm -f apps/nc/*.c apps/nc/*.h 216rm -f apps/nc/*.c apps/nc/*.h
216$CP $libc_src/stdlib/strtonum.c apps/nc 217$CP $libc_src/stdlib/strtonum.c apps/nc
217for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do 218for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
@@ -222,6 +223,7 @@ done
222 223
223# copy openssl(1) source 224# copy openssl(1) source
224echo "copying openssl(1) source" 225echo "copying openssl(1) source"
226$CP $app_src/openssl/openssl.1 apps/openssl
225rm -f apps/openssl/*.c apps/openssl/*.h 227rm -f apps/openssl/*.c apps/openssl/*.h
226$CP $libc_src/stdlib/strtonum.c apps/openssl/compat 228$CP $libc_src/stdlib/strtonum.c apps/openssl/compat
227$CP $libcrypto_src/cert.pem apps/openssl 229$CP $libcrypto_src/cert.pem apps/openssl