X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f6c3a80bb46ab6f6ada3cd69eaca9a04e9db64c9..435cc8fef85299175abdc7734e8d2c81dd766bf3:/Makefile

diff --git a/Makefile b/Makefile
index 8a2de99..4df8c56 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,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 +151,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,6 +160,14 @@ DOTLINKS		+= .bashrc .inputrc
 .bash_logout_SRC	 = shell-logout
 .zlogout_SRC		 = shell-logout
 
+## 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
@@ -276,6 +285,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
 
 ###--------------------------------------------------------------------------
@@ -325,6 +339,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))
@@ -335,6 +362,7 @@ $(addprefix $(HOME)/bin/, $(SCRIPTLINKS)): $(HOME)/bin/%: \
 		ln -s $(call script-source,$*) $@.new && \
 		mv $@.new $@
 	$(script-hook/$*)
+endif
 
 all:: $(addprefix $(HOME)/bin/, $(SCRIPTLINKS))