From 23031d8b2f56c0e527813df1da5f0250ac182d10 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 8 Mar 2018 15:23:36 +0100 Subject: [PATCH] Makefile: Run `npm install` when necessary Also mark phony targets as such. --- Makefile | 7 ++++++- README.md | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 69d2367..c831764 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PACKAGE_NAME := $(shell python3 -c "import json; print(json.load(open('package.json'))['name'])") -all: +all: node_modules/react-lite NODE_ENV=$(NODE_ENV) npm run build clean: @@ -40,3 +40,8 @@ rpm: dist-gzip find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \; rm -r "`pwd`/rpmbuild" rm -r "`pwd`/output" "`pwd`/build" + +node_modules/react-lite: + npm install + +.PHONY: all clean install install-only dist-gzip srpm rpm diff --git a/README.md b/README.md index 13cd32a..093eb0c 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ Scaffolding for a [Cockpit](http://www.cockpit-project.org) module. # Building -Run `npm install` to install dependencies and `make` to build the package. It -builds into the `dist` directory. Link or copy that to a location were -`cockpit-bridge` looks for packages. +Run `make` to build the package. It builds into the `dist` directory. Link or +copy that to a location were `cockpit-bridge` looks for packages. `make install` compiles and installs the package in `/usr/share/cockpit/`. The convenience targets `srpm` and `rpm` build the source and binary rpms,