Merge branch 'e3_665_fix_header_install' into 'master'

E3-665: Allow other header files to be installed

See merge request e3/e3-require!64

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed issue where `LD_LIBRARY_PATH` could keep old `siteLibs` path around
 * Removed duplicated entries from generated `.dep` files
 * Removed `dev` targets from modules that function in "local source mode"
+* Fixed issue where `.hpp` files were not installed correctly with `KEEP_HEADER_SUBDIRS`
 
 ### Other changes
 * Removed `<module>_TEMPLATES` in favour of `<module>_DB`

require-ess/tools/driver.makefile

@@ -742,7 +742,10 @@ debug::
 define install_subdirs
 $1_HDRS = $$(filter $1/%,$$(HDRS))
 INSTALL_HDRS += $$(addprefix $$(INSTALL_INCLUDE)/,$$($1_HDRS:$1/%=%))
-vpath %h ../$1
+vpath %.h ../$1
+vpath %.hpp ../$1
+vpath %.hh ../$1
+vpath %.hxx ../$1
 debug::
 	@echo "$1_HDRS = $$($1_HDRS)"
 endef