The current build system, with nothing overridden, will install the
header files to /include, which AFAIK isn't correct for any
distribution.
Signed-off-by: Benjamin Marzinski <bmarz...@redhat.com>
---
Makefile.inc | 3 +--
create-config.mk | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index ed40b449..c5ec62d2 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -64,7 +64,7 @@ mandir := /usr/share/man
LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
syslibdir := $(prefix)$(LIB)
usrlibdir := $(usr_prefix)$(LIB)
-includedir := $(usr_prefix)include
+includedir := /usr/include
pkgconfdir := $(usrlibdir)/pkgconfig
plugindir := $(prefix)$(LIB)/multipath
configdir := $(etc_prefix)etc/multipath/conf.d
@@ -73,7 +73,6 @@ statedir := $(etc_prefix)etc/multipath
runtimedir := $(if $(shell test -L /var/run -o ! -d /var/run && echo
1),/run,/var/run)
devmapper_incdir := $(or $(shell $(PKG_CONFIG) --variable=includedir
devmapper),/usr/include)
libudev_incdir := $(or $(shell $(PKG_CONFIG) --variable=includedir
libudev),/usr/include)
-kernel_incdir := /usr/include
ifeq ($(V),)
Q := @
diff --git a/create-config.mk b/create-config.mk
index 4d318b96..963f6074 100644
--- a/create-config.mk
+++ b/create-config.mk
@@ -103,7 +103,7 @@ ifneq ($(call
check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h)
DEFINES += LIBDM_API_HOLD_CONTROL
endif
-ifneq ($(call
check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0)
+ifneq ($(call
check_var,ELS_DTAG_LNK_INTEGRITY,$(includedir)/scsi/fc/fc_els.h),0)
DEFINES += FPIN_EVENT_HANDLER
FPIN_SUPPORT = 1
endif
@@ -117,7 +117,7 @@ ifneq ($(call
check_func,mnt_table_parse_swaps,$(libmount_h)),0)
DEFINES += LIBMOUNT_SUPPORTS_SWAP
endif
-ifneq ($(call check_file,$(kernel_incdir)/linux/nvme_ioctl.h),0)
+ifneq ($(call check_file,$(includedir)/linux/nvme_ioctl.h),0)
ANA_SUPPORT := 1
endif
--
2.41.0
