X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ddc97f65b793547389319d1b528656a76c9fa4c5..08b1b191f94dfa200659b03794ef63bdcc51946e:/Makefile

diff --git a/Makefile b/Makefile
index 00d06e4..b6b5774 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,12 @@ symlink-ok-p		 = $(shell \
 
 ## Silent rules machinery.
 V			 = 0
-v_tag			 = $(call v_tag_$V,$1,$2)
-v_tag_0			 = @printf "  %-8s %s\n" "$1" $(call quote,$@);
 V_AT			 = $(V_AT_$V)
 V_AT_0			 = @
+v_print			 = $(call v_print_$V,$1,$2)
+v_print_0		 = \
+	printf "  %-8s %s\n" "$1" $(call quote,$(patsubst $(HOME)/%,~/%,$2));
+v_tag			 = $(V_AT)$(call v_print_$V,$1,$@)
 
 ## Hack.
 relax			 =
@@ -33,7 +35,7 @@ relax			 =
 ### Configuration.
 
 ## Figure out where I am.
-HERE			 = $(shell pwd)
+HERE			:= $(shell pwd)
 
 ## Decide on how to fetch things from URLs.
 ifeq ($(shell (curl >/dev/null 2>&1 --version || [ $$? -eq 2 ]) && echo t),t)
@@ -46,8 +48,9 @@ endif
 EMACS			:= $(shell \
 	emacs=nil; \
 	for i in emacs24 emacs23 emacs22 emacs21 emacs; do \
-	  if type >/dev/null 2>&1 $$i; then echo $$i; break; fi; \
-	done)
+	  if type >/dev/null 2>&1 $$i; then emacs=$$i; break; fi; \
+	done; \
+	echo $$emacs)
 
 ## Whence to obtain externally hosted stuff.
 REPO			 = https://ftp.distorted.org.uk/u/mdw/profile
@@ -69,7 +72,8 @@ ifneq ($(EMACS),nil)
 EMACSLIB		 = $(HOME)/lib/emacs
 
 EMACS_VERSION		:= $(shell $(EMACS) 2>&1 -Q --batch --eval \
-	'(message "%s %s" emacs-major-version emacs-minor-version)')
+	'(message "%s %s" emacs-major-version emacs-minor-version)' | \
+	tail -n1)
 emacs-version-p		 = $(shell set -- $(EMACS_VERSION); \
 	if [ $$1 -gt $1 ] || ([ $$1 -eq $1 ] && [ $$2 -ge $2 ]); then \
 	  echo t; \
@@ -150,7 +154,7 @@ SCRIPTLINKS		+= update-buildable-branch
 
 ## Shells.
 DOTLINKS		+= .profile .shell-rc .shell-logout
-DOTLINKS		+= .shrc .rcrc
+DOTLINKS		+= .shrc
 DOTLINKS		+= .zprofile .zshrc .zlogout .zshenv
 DOTLINKS		+= .bash_profile .bash_completion .bash_logout
 DOTLINKS		+= .bashrc .inputrc
@@ -159,12 +163,26 @@ DOTLINKS		+= .bashrc .inputrc
 .bash_logout_SRC	 = shell-logout
 .zlogout_SRC		 = shell-logout
 
+all::
+	$(V_AT)if [ $(HOME)/.zcompdump -ot dot/zshrc ]; then \
+	  $(call v_print,ZAP,$(HOME)/.zcompdump)rm -f $(HOME)/.zcompdump; \
+	fi
+
+## The Plan 9 `rc' shell.  This needs special hacking, because the Linux port
+## and Plan 9 From User Space have incompatible syntax.
+DOTLINKS		+= lib/profile
+lib/profile_SRC		 = rcrc
+all:: $(HOME)/.rcrc
+$(HOME)/.rcrc: dot/rcrc
+	$(call v_tag,SED)sed 's/; if not/else/' $< >$@.new && mv $@.new $@
+
 ## Git.
 DOTSUBST		+= .gitconfig
 SCRIPTLINKS		+= git-copyright-dates
 DOTLINKS		+= .cgrc .tigrc
 .gitconfig_SUBSTS	 = \
-	$(call substvar,releasekey,$(call mdw-conf,release-key,481334C2))
+	$(call substvar,releasekey,$(call mdw-conf,releasekey,481334C2)) \
+	$(call substvar,email,$(call mdw-conf,email,mdw@distorted.org.uk))
 $(HOME)/.gitconfig: $(HOME)/.mdw.conf
 
 ## PulseAudio.
@@ -205,9 +223,10 @@ SCRIPTLINKS		+= mdw-conf
 SCRIPTLINKS		+= svnwrap
 SCRIPTLINKS		+= guest-console
 SCRIPTLINKS		+= hyperspec
+SCRIPTLINKS		+= datasyms
 
 ## Random odds and ends.
-DOTLINKS		+= .lesskey .infokey .sqliterc
+DOTLINKS		+= .infokey .sqliterc
 DOTLINKS		+= .gdbinit .toprc .aspell.conf
 DOTLINKS		+= .dircolors .colordiffrc .screenrc .tmux.conf
 DOTLINKS		+= .cvsrc .indent.pro .ditz-config
@@ -233,6 +252,11 @@ DOTLINKS		+= .mc/ini .mc/panels.ini
 DOTLINKS		+= .parallel/config
 .parallel/config_SRC	 = parallel-config
 
+all:: $(HOME)/.less
+$(HOME)/.less: dot/lesskey
+	$(V_AT)rm -f $(HOME)/.lesskey
+	$(call v_tag,LESSKEY)lesskey -o$@ $<
+
 ###--------------------------------------------------------------------------
 ### X11 configuration.
 
@@ -271,6 +295,8 @@ SCRIPTLINKS		+= xinitcmd lock-screen xshutdown
 SCRIPTLINKS		+= un-backslashify-selection
 SCRIPTLINKS		+= xpra-start-xdummy
 SCRIPTLINKS		+= play-rawk
+SCRIPTLINKS		+= media-keys
+SCRIPTLINKS		+= disorder-notify
 
 DOTCPP			+= .Xdefaults
 Xdefaults_DEFS		 = -DEMACSWD=$(call mdw-conf,emacs-width,77)
@@ -330,6 +356,19 @@ $(relax)### generated by $(HERE)/Makefile; do not edit!" \
 ### Processing script links.
 
 script-source		 = $(HERE)/bin/$(or $($1_SRC), $1)
+
+ifeq ($(prefix-shebang-p),t)
+all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))
+$(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
+		$$(call script-source,$$*) Makefile
+	$(call v_tag,SHEBANG)mkdir -p $(dir $@) && \
+		rm -f $@.new && \
+		sed "1s\(#! *\)/\1$(SHEBANG_PREFIX)/" \
+			$(call script-source,$*) >$@.new && \
+		chmod --reference=$(call script-source,$*) $@.new && \
+		mv $@.new $@
+	$(script-hook/$*)
+else
 scriptlink-ok-p		 = \
 	$(call symlink-ok-p,$(HOME)/bin/$1,$(call script-source,$1))
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))
@@ -340,6 +379,7 @@ $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
 		ln -s $(call script-source,$*) $@.new && \
 		mv $@.new $@
 	$(script-hook/$*)
+endif
 
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))