X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5f9b345abf0526aedb88dc42f9f06fe3328c10ee..3a89d8c9c14af676582bcbbef4a689089e38b1fc:/Makefile diff --git a/Makefile b/Makefile index 196a33f..00d06e4 100644 --- a/Makefile +++ b/Makefile @@ -276,6 +276,11 @@ DOTCPP += .Xdefaults Xdefaults_DEFS = -DEMACSWD=$(call mdw-conf,emacs-width,77) $(HOME)/.Xdefaults: $(HOME)/.mdw.conf +ifeq ($(shell case $${DISPLAY-nil} in (:[0-9]*) echo t ;; (*) echo nil ;; esac),t) +dotfile-hook/.Xdefaults = \ + $(call v_tag,XRDB)xrdb -override $< +endif + endif ###-------------------------------------------------------------------------- @@ -293,6 +298,7 @@ $(addprefix $(HOME)/, $(subst %,\%,$(DOTLINKS))): $(HOME)/%: \ rm -f $@.new && \ ln -s $(call dotfile-source,$*) $@.new && \ mv $@.new $@ + $(dotfile-hook/$*) ## Hack with the C preprocessor. all:: $(addprefix $(HOME)/, $(DOTCPP)) @@ -302,6 +308,7 @@ $(addprefix $(HOME)/, $(subst %,\%,$(DOTCPP))): $(HOME)/%: \ rm -f $@.new && \ cpp -P -o$@.new $($*_DEFS) $< && \ mv $@.new $@ + $(dotfile-hook/$*) ## Hack by making simple substitutions. substvar = -e $(call quote,s@$1@$2g) @@ -309,7 +316,7 @@ SUBSTS += $(call substvar,home,$(HOME)) SUBSTS += $(call substvar,profile,$(HERE)) all:: $(addprefix $(HOME)/, $(DOTSUBST)) $(addprefix $(HOME)/, $(subst %,\%,$(DOTSUBST))): $(HOME)/%: \ - $$(call dotsubst-source,$$*,.in) Makefile + $$(call dotfile-source,$$*,.in) Makefile $(call v_tag,SUBST)mkdir -p $(dir $@) && \ rm -f $@.new && \ sed -e "1i\ @@ -317,6 +324,7 @@ $(relax)### generated by $(HERE)/Makefile; do not edit!" \ $(SUBSTS) $($*_SUBSTS) \ $(call dotfile-source,$*,.in) >$@.new && \ mv $@.new $@ + $(dotfile-hook/$*) ###-------------------------------------------------------------------------- ### Processing script links. @@ -331,6 +339,7 @@ $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \ rm -f $@.new && \ ln -s $(call script-source,$*) $@.new && \ mv $@.new $@ + $(script-hook/$*) all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)) @@ -387,6 +396,7 @@ $(foreach p, $(PACKAGES), $(call pkg-stamp,$p,install)): \ $(call v_tag,INSTALL)cd $(dir $@) && \ $(MAKE) $($*_MAKEFLAGS) install >>buildlog 2>&1 && \ touch install-stamp + $(package-hook/$*) all:: $(foreach p, $(PACKAGES), $(DEP_$p)) $(foreach p, $(PACKAGES), $(eval _pkg.$p: $(call pkg-stamp,$p,install)))