Skip to content

Commit 6d03a11

Browse files
committed
build: Fix inconsistent NODE_CACHE path
We want NODE_CACHE to be a built file in the build dir. So declare that properly and use it at face value, instead of mangling the path in the `node-modules runtime-tar` output argument. This fixes tools/make-dist if the project root already contains the tarballs. That happens when a previous `packit propose-downstream` already ran and moved the tarballs to the project root. Fixes #22675
1 parent f98e57a commit 6d03a11

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ $(distdir)/configure: $(distdir)/version.m4
6363

6464
# Various downstream packaging assets
6565

66-
NODE_CACHE = cockpit-node-$(VERSION).tar.xz
66+
NODE_CACHE = $(CURDIR)/cockpit-node-$(VERSION).tar.xz
6767

6868
$(NODE_CACHE): $(srcdir)/package-lock.json
69-
$(AM_V_GEN) $(srcdir)/tools/node-modules runtime-tar $(CURDIR)/$(NODE_CACHE)
69+
$(AM_V_GEN) $(srcdir)/tools/node-modules runtime-tar $(NODE_CACHE)
7070

7171
dist-hook: $(distdir)/tools/debian/copyright
7272
# when building from a git checkout, we need to generate the copyright file

0 commit comments

Comments
 (0)