diff --git a/.gitignore b/.gitignore index 3a976fd49..270e51680 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ src/zcash-cli src/zcash-gtest src/zcash-tx src/test/test_bitcoin +zcutil/bin/ *zcashTest.pk *zcashTest.vk @@ -116,5 +117,6 @@ libzcashconsensus.pc contrib/debian/files contrib/debian/substvars +src/fuzzing/*/input src/fuzzing/*/output src/fuzz.cpp diff --git a/Makefile.am b/Makefile.am index 7f32fc576..141f1a849 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,3 +169,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man clean-local: rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/ rm -rf afl-temp + +distclean-local: + rm -f zcutil/bin/db_* + rmdir zcutil/bin 2>/dev/null || true diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index 539fa873e..5807aab29 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -32,5 +32,11 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include + $(MAKE) DESTDIR=$($(package)_staging_dir) install +endef + +define $(package)_postprocess_cmds + cd $(BASEDIR)/../zcutil && \ + mkdir -p bin && \ + mv -f $($(package)_staging_dir)$(host_prefix)/bin/db_* bin endef diff --git a/zcutil/distclean.sh b/zcutil/distclean.sh index acb5c1f4f..feb1a639a 100755 --- a/zcutil/distclean.sh +++ b/zcutil/distclean.sh @@ -10,3 +10,6 @@ rm -rf depends/sources rm -rf afl-temp rm -rf src/fuzzing/*/output +# These are not in clean.sh because they are only generated when building dependencies. +rm -f zcutil/bin/db_* +rmdir zcutil/bin 2>/dev/null || true