X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/486623cb8d2a0c229b36a81f6fc03ef9e093ae93..3a89d8c9c14af676582bcbbef4a689089e38b1fc:/Makefile

diff --git a/Makefile b/Makefile
index 342f3ef..00d06e4 100644
--- a/Makefile
+++ b/Makefile
@@ -151,13 +151,17 @@ SCRIPTLINKS		+= update-buildable-branch
 ## Shells.
 DOTLINKS		+= .profile .shell-rc .shell-logout
 DOTLINKS		+= .shrc .rcrc
-DOTLINKS		+= .zprofile .zshrc .zshenv
-DOTLINKS		+= .bash_profile .bash_completion .bashrc .inputrc
+DOTLINKS		+= .zprofile .zshrc .zlogout .zshenv
+DOTLINKS		+= .bash_profile .bash_completion .bash_logout
+DOTLINKS		+= .bashrc .inputrc
 .bash_profile_SRC	 = bash-profile
 .bash_completion_SRC	 = bash-completion
+.bash_logout_SRC	 = shell-logout
+.zlogout_SRC		 = shell-logout
 
 ## Git.
 DOTSUBST		+= .gitconfig
+SCRIPTLINKS		+= git-copyright-dates
 DOTLINKS		+= .cgrc .tigrc
 .gitconfig_SUBSTS	 = \
 	$(call substvar,releasekey,$(call mdw-conf,release-key,481334C2))
@@ -207,6 +211,8 @@ DOTLINKS		+= .lesskey .infokey .sqliterc
 DOTLINKS		+= .gdbinit .toprc .aspell.conf
 DOTLINKS		+= .dircolors .colordiffrc .screenrc .tmux.conf
 DOTLINKS		+= .cvsrc .indent.pro .ditz-config
+DOTLINKS		+= .lftp/rc
+.lftp/rc_SRC		 = lftp-rc
 DOTSUBST		+= .mykermrc
 SCRIPTLINKS		+= lesspipe.sh
 
@@ -264,11 +270,17 @@ DOTLINKS		+= .config/gtk-3.0/settings.ini
 SCRIPTLINKS		+= xinitcmd lock-screen xshutdown
 SCRIPTLINKS		+= un-backslashify-selection
 SCRIPTLINKS		+= xpra-start-xdummy
+SCRIPTLINKS		+= play-rawk
 
 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
 
 ###--------------------------------------------------------------------------
@@ -286,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))
@@ -295,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)
@@ -302,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\
@@ -310,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.
@@ -324,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))
 
@@ -380,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)))