Bläddra i källkod

Makefile: Use scutil for hostname on osx

Works around stuff like vpn dns setting its own hostname
and hostname -s to return that dns name verus the configured
name for the mac.
master
Mitch Tishmack 8 år sedan
förälder
incheckning
a7ed4f8c13
1 ändrade filer med 4 tillägg och 4 borttagningar
  1. +4
    -4
      Makefile

+ 4
- 4
Makefile Visa fil

@@ -8,10 +8,10 @@ LASTGEN:=$(PWD)/generation/$(LAST)
TANGLERS:=$(shell ls -d *.org) TANGLERS:=$(shell ls -d *.org)
GEN:=$(LAST) GEN:=$(LAST)
OPTS:= OPTS:=
# 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)")
# OSX uses scutil --get ComputerName
# uname -n && hostname -s can return dhcp addresses
# which aren't stable.
HOST=$(shell echo "$$(scutil --get ComputerName || uname -n)")
USEROPTS:=$(OPTS):$(HOST) USEROPTS:=$(OPTS):$(HOST)
NAME:=default NAME:=default




Laddar…
Avbryt
Spara