aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-02-08 15:17:35 +0000
committerlloyd <[email protected]>2014-02-08 15:17:35 +0000
commit1895c74f25debdf1a9d1ca9e539ec6cb598012a7 (patch)
tree973b51a65ac14e5f2ca3fbbde1b96544d54c1cc9
parentd9356dd618329fd9801f24e38caa1e331b8d5c89 (diff)
Install command line app
-rw-r--r--doc/relnotes/1_11_8.rst3
-rw-r--r--src/build-data/makefile/gmake.in1
-rw-r--r--src/build-data/makefile/nmake.in6
3 files changed, 10 insertions, 0 deletions
diff --git a/doc/relnotes/1_11_8.rst b/doc/relnotes/1_11_8.rst
index 7f4c4374d..2e8ac1b02 100644
--- a/doc/relnotes/1_11_8.rst
+++ b/doc/relnotes/1_11_8.rst
@@ -1,6 +1,9 @@
Version 1.11.8, Not Yet Released
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+* The `botan` command line application introduced in 1.11.7 is now
+ installed along with the library.
+
* The ChaCha20 stream cipher has been added.
* CMAC now supports 256 and 512 bit block ciphers, which also allows
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index ab7676635..5886ad5bb 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -87,6 +87,7 @@ endif
$(MKDIR_INSTALL) $(BINDIR)
$(INSTALL_CMD_EXEC) $(CONFIG_SCRIPT) $(BINDIR)
+ $(INSTALL_CMD_EXEC) $(APP) $(BINDIR)
$(MKDIR_INSTALL) $(PKGCONF_DIR)
$(INSTALL_CMD_DATA) $(PKGCONFIG) $(PKGCONF_DIR)
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 9a248117b..9ab563b1a 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -81,3 +81,9 @@ install: $(LIBRARIES) docs
-$(MKDIR) $(DESTDIR)\include\botan
$(INSTALL_CMD) botan.* $(DESTDIR)
$(INSTALL_CMD) build\include\botan\*.h $(DESTDIR)\include\botan
+
+ -$(MKDIR) $(DESTDIR)\bin
+ $(INSTALL_CMD) $(APP) $(DESTDIR)\bin
+
+ -$(MKDIR) $(DESTDIR)\lib
+ $(INSTALL_CMD) $(LIBRARIES) $(DESTDIR)\lib