From 52a5079cf243c029e480a0d7debc80c790a14495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 27 Jul 2015 10:36:12 +0200 Subject: [PATCH] Fix bug with install target in make closes #223 --- ChangeLog | 5 ++++- Makefile | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7df2623c16..fcd30ec015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,11 @@ Bugfix * Fix segfault in the benchmark program when benchmarking DHM. * Fix build error with CMake and pre-4.5 versions of GCC (found by Hugo Leisink). - * Fix bug in CMake lists that cause libmbedcrypto.a not to be installed + * Fix bug in CMake lists that caused libmbedcrypto.a not to be installed (found by Benoit Lecocq). + * Fix bug in Makefile that caused libmbedcrypto and libmbedx509 not to be + installed (found by Rawi666). + = mbed TLS 2.0.0 released 2015-07-13 diff --git a/Makefile b/Makefile index 0c489f891c..1c715a6a4f 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,9 @@ install: all cp -r include/mbedtls $(DESTDIR)/include mkdir -p $(DESTDIR)/lib - cp -RP library/libmbedtls.* $(DESTDIR)/lib + cp -RP library/libmbedtls.* $(DESTDIR)/lib + cp -RP library/libmbedx509.* $(DESTDIR)/lib + cp -RP library/libmbedcrypto.* $(DESTDIR)/lib mkdir -p $(DESTDIR)/bin for p in programs/*/* ; do \ @@ -40,6 +42,8 @@ install: all uninstall: rm -rf $(DESTDIR)/include/mbedtls rm -f $(DESTDIR)/lib/libmbedtls.* + rm -f $(DESTDIR)/lib/libmbedx509.* + rm -f $(DESTDIR)/lib/libmbedcrypto.* for p in programs/*/* ; do \ if [ -x $$p ] && [ ! -d $$p ] ; \