From 8f8674defd7005e8916396a929788f860f42cc6f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 21 Jun 2023 09:48:16 +0200 Subject: [PATCH] -missing toplevel 'make install' components --- Makefile | 1 + packages/aml-backoffice-ui/Makefile | 30 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b4a24c5e3..49721c778 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,7 @@ install: make -C packages/taler-harness TOPLEVEL=yes install-nodeps make -C packages/demobank-ui TOPLEVEL=yes install-nodeps make -C packages/merchant-backoffice-ui TOPLEVEL=yes install-nodeps + make -C packages/aml-backoffice-ui TOPLEVEL=yes install-nodeps .PHONY: install-tools # Install taler-wallet-cli and taler-harness diff --git a/packages/aml-backoffice-ui/Makefile b/packages/aml-backoffice-ui/Makefile index ddbef73b3..2653ce92f 100644 --- a/packages/aml-backoffice-ui/Makefile +++ b/packages/aml-backoffice-ui/Makefile @@ -1,17 +1,35 @@ # This Makefile has been placed in the public domain -# Settings from "./configure" -include .config.mk +ifeq ($(TOPLEVEL), yes) + $(info top-level build) + -include ../../.config.mk +else + $(info package-level build) + -include ../../.config.mk + -include .config.mk +endif +$(info prefix is $(prefix)) + +.PHONY: all all: @echo run \'make install\' to install spa_dir=$(prefix)/share/taler/aml-backoffice-ui -install: - pnpm install --frozen-lockfile --filter @gnu-taler/aml-backoffice-ui... - pnpm run check - pnpm run build +.PHONY: install-nodeps +install-nodeps: install -d $(spa_dir) install ./dist/prod/* $(spa_dir) +.PHONY: deps +deps: + pnpm install --frozen-lockfile --filter @gnu-taler/aml-backoffice-ui... + pnpm run check + pnpm run build + +.PHONY: install +install: + $(MAKE) deps + $(MAKE) install-nodeps +