From d954dd5e192834a72a2d05b428fc0e8cef599c31 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 19:48:16 +0100 Subject: Makefile: interpolate $(target_*) for a nicer log --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e61d16b75..9ed045e4d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ export target_path ?= /var/src evaluate = \ nix-instantiate \ - --arg configuration "./$$LOGNAME/1systems/$$system.nix" \ + --arg configuration ./$(LOGNAME)/1systems/$(system).nix \ --eval \ --readonly-mode \ --show-trace \ @@ -22,7 +22,7 @@ execute = \ # usage: make deploy system=foo [target_host=bar] deploy: $(call execute,populate) - @set -x; ssh "$$target_user@$$target_host" nixos-rebuild switch -I "$$target_path" + ssh $(target_user)@$(target_host) nixos-rebuild switch -I $(target_path) # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate) -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/f7200000.lock: No such file or directory (2)