From c9313a9e6a5d242e5553b5515503436521305781 Mon Sep 17 00:00:00 2001 From: Kai Tetzlaff Date: Sat, 11 Aug 2012 14:10:18 +0200 Subject: [PATCH] update mk --- emacsd-defs.mk | 5 +++++ util.mk | 4 ++++ vcs.mk | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/emacsd-defs.mk b/emacsd-defs.mk index 0a1580e..a320ad0 100644 --- a/emacsd-defs.mk +++ b/emacsd-defs.mk @@ -3,6 +3,11 @@ ifndef HAS_UTIL_MK include $(HOME)/Documents/mk/util.mk endif +ifeq (tetzco.de,$(DOMAIN)) + URL_TETZCO ?= https://www.tetzco.de/ +endif +URL_TETZCO ?= https://kail.dyndns.org/ + EMACS_OSX := $(strip\ $(or $(wildcard $(HOME)/Work/oss/emacs-mac-port/mac/Emacs.app/Contents/MacOS/Emacs),\ $(wildcard $(HOME)/Work/oss/build/osx/clang/64/dbg/emacs-new/nextstep/Emacs.app/Contents/MacOS/Emacs))) diff --git a/util.mk b/util.mk index 3f0a71a..21981a0 100644 --- a/util.mk +++ b/util.mk @@ -89,6 +89,10 @@ ifneq (,$(or $(ComSpec),$(COMSPEC),$(comspec))) fixpath-make = $(subst \,/,$(subst $(sp),?,$(1))) MD := mkdir endif +else + FQDN := $(shell hostname -f) + HOSTNAME := $(shell hostname -s) + DOMAIN := $(subst $(HOSTNAME).,,$(FQDN)) endif HOSTENV ?= unix diff --git a/vcs.mk b/vcs.mk index 5041ca7..ceedd4a 100644 --- a/vcs.mk +++ b/vcs.mk @@ -55,7 +55,7 @@ define HG_TMPL @echo +++ Updating[hg]: $$(patsubst pull-%,%,$$@) $(SHQ)($2$(SHQ)) @echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $$(pre_up_cmd-$1) - $(HG) -R $(subst /,$(DIRSEP),$(subst $(DOT_DIR)/,,$1)) pull $(HGPULL_FLAGS) + $(HG) -R $(subst /,$(DIRSEP),$(subst $(DOT_DIR)/,,$1)) pull $(HGPULL_FLAGS) $2 $(HG) -R $(subst /,$(DIRSEP),$(subst $(DOT_DIR)/,,$1)) update $(HGPULL_FLAGS) $$(post_up_cmd-$1)