aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-01-09 21:27:30 -0500
committerJack Lloyd <[email protected]>2017-01-09 21:27:30 -0500
commit7a7defde247cd94bededdc1c1fc7a600403e090d (patch)
tree1811a5728bf955dbb3bf14347248f69b81f9a92e
parent076598a28972f5f92d6d9d55d2b332ae9016e869 (diff)
Remove minor number from header include dir
Already pkg-config had this, was missed in GH #802 See also GH #830
-rw-r--r--src/build-data/buildh.in2
-rwxr-xr-xsrc/scripts/install.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index e65aa3ed3..de2b5c8b5 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -27,7 +27,7 @@
%{unsafe_fuzzer_mode_define}
#define BOTAN_INSTALL_PREFIX R"(%{prefix})"
-#define BOTAN_INSTALL_HEADER_DIR "%{includedir}/botan-%{version_major}.%{version_minor}"
+#define BOTAN_INSTALL_HEADER_DIR "%{includedir}/botan-%{version_major}"
#define BOTAN_INSTALL_LIB_DIR "%{libdir}"
#define BOTAN_LIB_LINK "%{link_to}"
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 0045be844..e03e5c22c 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -130,7 +130,7 @@ def main(args = None):
'botan-%d.%d.%d' % (ver_major, ver_minor, ver_patch))
target_include_dir = os.path.join(options.destdir,
options.includedir,
- 'botan-%d.%d' % (ver_major, ver_minor),
+ 'botan-%d' % (ver_major),
'botan')
out_dir = process_template('%{out_dir}')