From 66786f7943ee83617cbe654103aa1d2fe7e33162 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Sun, 7 Jun 2020 18:35:49 -0400 Subject: [PATCH] Fix VPATH builds for user config cmd/zpool and lib/libzutil Makefile's use -I., which won't work with a VPATH build. Replace it with -I$(srcdir) instead. Reviewed-by: Brian Behlendorf Signed-off-by: Arvind Sankar Closes #10379 Closes #10421 --- cmd/zpool/Makefile.am | 2 +- lib/libzutil/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 5efa13184..157fed2e0 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/Rules.am -DEFAULT_INCLUDES += -I. +DEFAULT_INCLUDES += -I$(srcdir) sbin_PROGRAMS = zpool diff --git a/lib/libzutil/Makefile.am b/lib/libzutil/Makefile.am index 092312e0d..a41a765f0 100644 --- a/lib/libzutil/Makefile.am +++ b/lib/libzutil/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/config/Rules.am # Suppress unused but set variable warnings often due to ASSERTs AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE) -DEFAULT_INCLUDES += -I. +DEFAULT_INCLUDES += -I$(srcdir) noinst_LTLIBRARIES = libzutil.la