From e58921e546e68366f2b294a01ab1afa262ab8b95 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Mar 2016 12:32:29 +0100 Subject: Makefile: ifndef HOSTNAME, def it --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 226c0f297..bd4544000 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ stockholm ?= . +export HOSTNAME ?= $(shell cat /proc/sys/kernel/hostname) + export STOCKHOLM_VERSION ?= $(shell \ version=git.$$(git describe --always --dirty); \ - case $$version in (*-dirty) version=$$version@$$(hostname); esac; \ + case $$version in (*-dirty) version=$$version@$$HOSTNAME; esac; \ date=$$(date +%y.%m); \ printf '%s' "$$date.$$version"; \ ) -- cgit v1.2.3 From 17be0772c5cfcb57f99299ad541b76dfabf8a62d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Mar 2016 12:41:24 +0100 Subject: Makefile: define nixos-config using ?= --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bd4544000..7252ca70e 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,9 @@ export STOCKHOLM_VERSION ?= $(shell \ printf '%s' "$$date.$$version"; \ ) -ifndef nixos-config $(if $(system),,$(error unbound variable: system)) -nixos-config = ./$(LOGNAME)/1systems/$(system).nix -endif + +nixos-config ?= $(stockholm)/$(LOGNAME)/1systems/$(system).nix # target = [target_user@]target_host[:target_port][/target_path] ifdef target -- cgit v1.2.3