X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/188ebb31cdc0a695e06097c28ad77ab732f3c47e..7fce54c3b09700595e14f0d5b35f1103cb9086de:/setup

diff --git a/setup b/setup
index b5fb47d..d1393df 100755
--- a/setup
+++ b/setup
@@ -133,7 +133,7 @@ fi
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile
+  vimrc mg zile lesskey
   ditz-config
   mailrc signature
   cgrc tigrc
@@ -149,9 +149,10 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap Xdefaults vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -178,6 +179,7 @@ echo "	all done."
 ## Substitute things which need substituting.
 dotfilessubst="
   gitconfig
+  mykermrc
   pulse-default.pa.in:.pulse/default.pa"
 echo "Installing dotfiles with substitutions..."
 for d in $dotfilessubst; do
@@ -194,7 +196,7 @@ for d in $dotfilessubst; do
 
 /@home@/ s$HOMEg
 /@profile@/ s$hereg
-/@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
+/@releasekey@/ s$(bin/mdw-conf releasekey 481334C2)g
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
@@ -241,6 +243,7 @@ scripts="
   lesspipe.sh
   start-ssh-agent
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
@@ -328,7 +331,7 @@ for f in dot-emacs.el Makefile; do
   mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f
 done
 $echon " compiling$echoc"
-make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs
+{ cd $HOME$sub/lib/emacs && make EMACS=$emacs; } >/dev/null 2>&1
 echo " done."
 
 ###----- That's all, folks --------------------------------------------------