X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/5f9b345abf0526aedb88dc42f9f06fe3328c10ee..cfcfc91b899eb3f2f205f80fb27a61c79154ef97:/Makefile

diff --git a/Makefile b/Makefile
index 196a33f..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
 
 ###--------------------------------------------------------------------------
@@ -293,6 +307,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 +317,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 +325,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,11 +333,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))
@@ -331,6 +361,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))
 
@@ -387,6 +419,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)))