diff options
author | Jack Lloyd <[email protected]> | 2017-01-09 21:49:10 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-01-09 21:49:10 -0500 |
commit | 321474f8ea827d2ee8427ebbb71be1acb793ceee (patch) | |
tree | dfcd58baa78b54a936ca3ccc904e9b08ca2ac464 | |
parent | 0b509f458b79965eedc6fbadd35319a7a28e7d4f (diff) | |
parent | 7a7defde247cd94bededdc1c1fc7a600403e090d (diff) |
Merge GH #833 Remove minor number from include dir
-rw-r--r-- | src/build-data/buildh.in | 2 | ||||
-rwxr-xr-x | src/scripts/install.py | 2 |
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}') |