public/mk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkin after merge

Browse Source
This commit is contained in:
Kai Tetzlaff (R&S) 2012-08-17 13:36:07 +02:00
commit d89c08c308
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacsd-defs.mk
View File

@ -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)))

4
util.mk
View File

@ -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

2
vcs.mk
View File

@ -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)