From f0c27eabf7d58404cbfee08afaa5ddb2362437f4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 19 Jun 2018 10:07:01 +0200 Subject: [PATCH] Makefile: Drop hardcoded "starter-kit" references We already parse the project name from the manifest. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4a5d72a..9020706 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ install: dist/index.js # this requires a built source tree and avoids having to install anything system-wide devel-install: dist/index.js mkdir -p ~/.local/share/cockpit - ln -s `pwd`/dist ~/.local/share/cockpit/starter-kit + ln -s `pwd`/dist ~/.local/share/cockpit/$(PACKAGE_NAME) # when building a distribution tarball, call webpack with a 'production' environment dist-gzip: NODE_ENV=production @@ -51,9 +51,9 @@ rpm: dist-gzip rm -r "`pwd`/rpmbuild" rm -r "`pwd`/output" "`pwd`/build" -# build a VM with locally built cockpit-starter-kit.rpm installed +# build a VM with locally built rpm installed $(VM_IMAGE): rpm bots - bots/image-customize -v -r 'rpm -e cockpit-starter-kit || true' -i cockpit -i `pwd`/cockpit-starter-kit-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) + bots/image-customize -v -r 'rpm -e cockpit-$(PACKAGE_NAME) || true' -i cockpit -i `pwd`/cockpit-$(PACKAGE_NAME)-*.noarch.rpm -s $(CURDIR)/test/vm.install $(TEST_OS) # convenience target for the above vm: $(VM_IMAGE)