From 0772f2c615512b2a344f7ce0ee8d2312761ad7cf Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 30 Jun 2022 09:19:39 +0200 Subject: [PATCH] Makefile: Stop disting git-utils.sh twice It is already contained in COCKPIT_REPO_FILES. Also fix a typo. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25c5220..734a90a 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' $(COCKPIT_REPO_STAMP): Makefile @git rev-list --quiet --objects $(COCKPIT_REPO_TREE) -- 2>/dev/null || \ git fetch --no-tags --no-write-fetch-head --depth=1 $(COCKPIT_REPO_URL) $(COCKPIT_REPO_COMMIT) - git archive $(COCKPIT_REPO_TREE) -- tools/git-utils.sh $(COCKPIT_REPO_FILES) | tar x + git archive $(COCKPIT_REPO_TREE) -- $(COCKPIT_REPO_FILES) | tar x # # i18n @@ -116,7 +116,7 @@ dist: $(TARFILE) # when building a distribution tarball, call webpack with a 'production' environment # we don't ship node_modules for license and compactness reasons; we ship a -# pre-built dist/ (so it's not necessary) and ship packge-lock.json (so that +# pre-built dist/ (so it's not necessary) and ship package-lock.json (so that # node_modules/ can be reconstructed if necessary) $(TARFILE): export NODE_ENV=production $(TARFILE): $(WEBPACK_TEST) $(SPEC)