From 03d8324c193028a6f9f96b929e71eaf85eb85ae8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 3 Sep 2021 07:50:39 +0200 Subject: [PATCH] Makefile: Avoid moving node_modules/ during dist build This is ugly as it races with other make targets which expect node_modules/ to exist. It's also unnecessary, we can just tell tar to ignore node_modules/. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index baaee7c..6bd204a 100644 --- a/Makefile +++ b/Makefile @@ -88,13 +88,11 @@ dist-gzip: $(TARFILE) $(TARFILE): export NODE_ENV=production $(TARFILE): $(WEBPACK_TEST) cockpit-$(PACKAGE_NAME).spec if type appstream-util >/dev/null 2>&1; then appstream-util validate-relax --nonet *.metainfo.xml; fi - mv node_modules node_modules.release touch -r package.json $(NODE_MODULES_TEST) touch dist/* tar czf cockpit-$(PACKAGE_NAME)-$(VERSION).tar.gz --transform 's,^,cockpit-$(PACKAGE_NAME)/,' \ - --exclude cockpit-$(PACKAGE_NAME).spec.in \ + --exclude cockpit-$(PACKAGE_NAME).spec.in --exclude node_modules \ $$(git ls-files) $(LIB_TEST) src/lib/patternfly/*.scss package-lock.json cockpit-$(PACKAGE_NAME).spec dist/ - mv node_modules.release node_modules srpm: $(TARFILE) cockpit-$(PACKAGE_NAME).spec rpmbuild -bs \