Skip to content

Commit e4d3667

Browse files
committed
build: Drop needless EXTRA_DIST content
Some EXTRA_DIST content is needless since a git archive is used as the source tarball.
1 parent 6c4da59 commit e4d3667

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

Makefile.am

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013-2016 The Bitcoin Core developers
1+
# Copyright (c) 2013-2020 The Bitcoin Core developers
22
# Distributed under the MIT software license, see the accompanying
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -43,16 +43,7 @@ OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
4343
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
4444
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
4545

46-
DIST_DOCS = \
47-
README.md \
48-
$(wildcard doc/*.md) \
49-
$(wildcard doc/release-notes/*.md)
50-
DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
51-
$(top_srcdir)/contrib/bitcoin-tx.bash-completion \
52-
$(top_srcdir)/contrib/bitcoind.bash-completion \
53-
$(top_srcdir)/contrib/debian/copyright \
54-
$(top_srcdir)/contrib/init \
55-
$(top_srcdir)/contrib/install_db4.sh \
46+
DIST_CONTRIB = \
5647
$(top_srcdir)/contrib/linearize/linearize-data.py \
5748
$(top_srcdir)/contrib/linearize/linearize-hashes.py
5849

@@ -246,7 +237,7 @@ endif
246237

247238
dist_noinst_SCRIPTS = autogen.sh
248239

249-
EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
240+
EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
250241

251242
EXTRA_DIST += \
252243
test/functional \

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ script: |
183183
rm -rf ${DISTNAME}/lib/pkgconfig
184184
find ${DISTNAME}/bin -type f -executable -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
185185
find ${DISTNAME}/lib -type f -print0 | xargs -0 -n1 -I{} ../contrib/devtools/split-debug.sh {} {} {}.dbg
186-
cp ../README.md ${DISTNAME}/
186+
cp ../../README.md ${DISTNAME}/
187187
find ${DISTNAME} -not -name "*.dbg" | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
188188
find ${DISTNAME} -name "*.dbg" | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
189189
cd ../../

0 commit comments

Comments
 (0)