Skip to content

Commit

Permalink
Fix VPATH builds for user config
Browse files Browse the repository at this point in the history
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 <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10379
Closes #10421
  • Loading branch information
nivedita76 authored and behlendorf committed Jun 10, 2020
1 parent 7150427 commit 66786f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/zpool/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am

DEFAULT_INCLUDES += -I.
DEFAULT_INCLUDES += -I$(srcdir)

sbin_PROGRAMS = zpool

Expand Down
2 changes: 1 addition & 1 deletion lib/libzutil/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 66786f7

Please sign in to comment.