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
commit7a194d35581cb75f27503e1a312fe1db9bbdc72d (patch)
treec3646829c770886e1e3393769845f1b32e29f278 /Makefile
parent3fdd34c510920bc9e8e9b245f93744327ad843e9 (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 e61d16b..9ed045e 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)