aboutsummaryrefslogtreecommitdiffstats
path: root/config/Rules.am
diff options
context:
space:
mode:
authorArvind Sankar <[email protected]>2020-06-19 22:08:59 -0400
committerBrian Behlendorf <[email protected]>2020-06-24 18:19:28 -0700
commit109d2c93102049e7d7fdd5de7f9edff717224b32 (patch)
tree08eeeb151b4ecbabe5e3617199da94762e7bdce6 /config/Rules.am
parent33982eb24c615f78b8f6b5f54c6acb6c29cbf6e3 (diff)
Move zfs_gitrev.h to build directory
Currently an out-of-tree build does not work with read-only source directory because zfs_gitrev.h can't be created. Move this file to the build directory, which is more appropriate for a generated file, and drop the dist-hook for zfs_gitrev.h. There is no need to distribute this file since it will be regenerated as part of the compilation in any case. scripts/make_gitrev.sh tries to avoid updating zfs_gitrev.h if there has been no change, however this doesn't cover the case when the source directory is not in git: in that case zfs_gitrev.h gets overwritten even though it's always "unknown". Simplify the logic to always write out a new version of zfs_gitrev.h, compare against the old and overwrite only if different. This is now simple enough to just include in the Makefile, so drop the script. Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Arvind Sankar <[email protected]> Closes #10493
Diffstat (limited to 'config/Rules.am')
-rw-r--r--config/Rules.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/Rules.am b/config/Rules.am
index fbbca81e6..c6dce34b0 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -4,7 +4,8 @@
#
DEFAULT_INCLUDES = \
- -include ${top_builddir}/zfs_config.h \
+ -include $(top_builddir)/zfs_config.h \
+ -I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/module/icp/include \
-I$(top_srcdir)/lib/libspl/include