From cf12fd83345f76186038923ca20a8ac3937ab700 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Sun, 30 Apr 2017 12:08:06 -0500
Subject: [PATCH] Fix Makefile to work with osx hostname -s

uname -n uses/catches dhcp addresses, which is dumb.
---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3cbd25a..623f1dd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,10 @@ LASTGEN:=$(PWD)/generation/$(LAST)
 TANGLERS:=$(shell ls -d *.org)
 GEN:=$(LAST)
 OPTS:=
-HOST:=$(shell uname -n)
+# OSX uses hostname -s for the "stable" hostname
+# uname -n can return dhcp addresses, which aren't
+# stable.
+HOST=$(shell echo "$$(hostname -s || uname -n)")
 USEROPTS:=$(OPTS):$(HOST)
 NAME:=default
 
@@ -31,11 +34,13 @@ next: diff
 
 .PHONY: tangle-next
 tangle-next:
+	@echo Tangling for hostname $(HOST)
 	$(MAKE) tangle
 	$(MAKE) generation
 	$(MAKE) next
 	$(MAKE) copy GEN=$(NEXT)
 	@echo $(NEXT) > .last
+	@echo Tangled for hostname $(HOST)
 
 copy:
 	cd $(PWD)/generation/$(GEN) && find . -type f -exec rm -f $(DEST)/{} \;