summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-12 19:48:16 +0100
committertv <tv@krebsco.de>2016-02-12 19:48:16 +0100
commitd954dd5e192834a72a2d05b428fc0e8cef599c31 (patch)
tree9b88e362f55fcefe2cb9cb123ad94a7dab364794 /Makefile
parent386a2191a13229b24a851d7ed02297d289cd5725 (diff)
Makefile: interpolate $(target_*) for a nicer log
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files 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)