X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/3e441da6394b0abeae5c53b0ad4a8d514d1fb4ee..63b40831b80c784c50bafbdef00a5cd07ddb91fd:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index a857bf3..7f9e43b 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
@@ -64,13 +67,26 @@ _force:
 ###--------------------------------------------------------------------------
 ### Emacs.
 
+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)' | \
+	tail -n1)
+emacs-version-p		 = $(shell set -- $(EMACS_VERSION); \
+	if [ $$1 -gt $1 ] || ([ $$1 -eq $1 ] && [ $$2 -ge $2 ]); then \
+	  echo t; \
+	fi)
+
 ELISP			+= make-regexp ew-hols
 ELISP			+= mdw-gnus-patch
 ELISP			+= mdw-multiple-cursors
 ELISP			+= git git-blame vc-git stgit quilt
+
+ifeq ($(call emacs-version-p,24,3),t)
 ELISP			+= bracketed-paste
+endif
 
 ELISP			+= dot-emacs
 dot-emacs_DEPS		 = make-regexp
@@ -79,9 +95,12 @@ SCRIPTLINKS		+= emacsclient-hack movemail-hack sendmail-hack
 SCRIPTLINKS		+= aspell-hack emerge-hack
 
 %.elc: %.el $$(foreach e, $$($$*_DEPS), $$(DEP_$$e))
-	$(call v_tag,EMACS)$(EMACS) -L el/ -L $(EMACSLIB) \
+	$(call v_tag,EMACS)if ! $(EMACS) >$*.build-log 2>&1 \
+		-L el/ -L $(EMACSLIB) \
 		--batch --no-site-file \
-		--eval '(byte-compile-file "$<")'
+		--eval '(byte-compile-file "$<")'; then \
+	  cat $*.build-log; exit 2; \
+	fi
 
 LOCAL_ELISP		 = $(filter $(notdir $(wildcard el/*.el)), \
 				$(addsuffix .el, $(ELISP)))
@@ -115,6 +134,8 @@ DOTLINKS		+= .emacs .emacs-calc .vm .gnus.el .ercrc.el
 all:: $(foreach e, $(ELISP), $(DEP_$e))
 $(foreach e, $(ELISP), $(eval _emacs.$e: $(EMACSLIB)/$e.elc))
 
+endif
+
 ###--------------------------------------------------------------------------
 ### Other simpler things.
 
@@ -133,14 +154,31 @@ 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		+= .shrc
+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
+
+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))
@@ -186,10 +224,12 @@ SCRIPTLINKS		+= guest-console
 SCRIPTLINKS		+= hyperspec
 
 ## 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
+DOTLINKS		+= .lftp/rc
+.lftp/rc_SRC		 = lftp-rc
 DOTSUBST		+= .mykermrc
 SCRIPTLINKS		+= lesspipe.sh
 
@@ -210,6 +250,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.
 
@@ -247,11 +292,19 @@ DOTLINKS		+= .config/gtk-3.0/settings.ini
 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)
 $(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
 
 ###--------------------------------------------------------------------------
@@ -259,7 +312,7 @@ endif
 
 dotfile-source		 = $(HERE)/dot/$(or $($1_SRC), $(1:.%=%)$2)
 
-## Easist: just make symlinks.
+## Easiest: just make symlinks.
 dotlink-ok-p		 = \
 	$(call symlink-ok-p,$(HOME)/$1,$(call dotfile-source,$1))
 all:: $(addprefix $(HOME)/, $(DOTLINKS))
@@ -269,6 +322,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))
@@ -278,6 +332,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)
@@ -285,7 +340,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\
@@ -293,11 +348,25 @@ $(relax)### generated by $(HERE)/Makefile; do not edit!" \
 			$(SUBSTS) $($*_SUBSTS) \
 			$(call dotfile-source,$*,.in) >$@.new && \
 		mv $@.new $@
+	$(dotfile-hook/$*)
 
 ###--------------------------------------------------------------------------
 ### 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))
@@ -307,6 +376,8 @@ $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
 		rm -f $@.new && \
 		ln -s $(call script-source,$*) $@.new && \
 		mv $@.new $@
+	$(script-hook/$*)
+endif
 
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))
 
@@ -363,6 +434,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)))