X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/73165cde4740aae25bcbe379c8f3ad2e6d3d8d5f..8244840ab180822fe9c37f73e4a1137997ef6566:/setup

diff --git a/setup b/setup
index 705e396..b64b0a5 100755
--- a/setup
+++ b/setup
@@ -104,7 +104,10 @@ for system in $systems; do
       cd $dir
       mkdir build
       cd build
-      ../configure --prefix=$HOME$sub >>buildlog 2>&1
+      ../configure \
+	--prefix=$HOME$sub \
+	PKG_CONFIG_PATH=$HOME$sub/lib/pkgconfig \
+	>>buildlog 2>&1
       $echon " building$echoc"
       make >>buildlog 2>&1
       $echon " installing$echoc"
@@ -130,15 +133,17 @@ 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
+  parallel-config:.parallel/config
   ditz-config
-  mailrc signature
+  mailrc signature muttrc
   cgrc tigrc
   gdbinit
   guile
   rcrc
   toprc
   mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
+  pulse-daemon.conf:.pulse/daemon.conf
   aspell.conf
   tclshrc:.tclshrc tclshrc:.wishrc
   lisp-init.lisp:.cmucl-init.lisp
@@ -146,9 +151,11 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
-  dircolors colordiffrc screenrc cvsrc indent.pro"
+  mdw-build.conf:.config/mdw-build.conf
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
+  dircolors colordiffrc screenrc tmux.conf cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -172,9 +179,29 @@ for d in $dotfiles; do
 done
 echo "	all done."
 
+## CPP-hack files which need it.
+cppfiles=""
+[ "$xstuff" ] && cppfiles="$cppfiles
+  Xdefaults"
+echo "Hacking files with C preprocessor..."
+for c in $cppfiles; do
+  target=.$c
+  case $c in
+    *:*) target=${c#*:} c=${c%%:*};;
+  esac
+  ft=$HOME$sub/$target
+  dir=${ft%/*}
+  mkdir -p $dir
+  cpp -P dot/$c -o $ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+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
@@ -191,7 +218,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"
@@ -200,13 +227,16 @@ echo "  all done."
 
 ## Symlink backgrounds.
 backgrounds="
-  jue-peek.jpg
-  medusa.jpg
   bsg-supper.jpg
-  rayne.jpg
+  harley-quinn.jpg
   hypatia.jpg
+  jue-peek.jpg
+  lilith.jpg
+  lovelace.jpg
+  medusa.jpg
   noodly.jpg
-  lovelace.jpg"
+  rayne.jpg
+"
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -229,20 +259,25 @@ scripts="
   mdw-editor
   mdw-pager
   mdw-conf
-  mdw-build
+  mdw-build mdw-sbuild mdw-sbuild-server
+  update-buildable-branch
   emacsclient-hack
   movemail-hack
   sendmail-hack
   aspell-hack
   emerge-hack
   lesspipe.sh
+  run-with-shell-env
   start-ssh-agent
+  start-ssh-pageant
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
   un-backslashify-selection
   lock-screen
+  xpra-start-xdummy
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
@@ -272,7 +307,7 @@ echo "	all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs23 emacs21 emacs; do
+for i in emacs23 emacs24 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break
@@ -291,6 +326,7 @@ emacspkg="
   ew-hols
   mdw-gnus-patch
   git git-blame vc-git stgit
+  mdw-multiple-cursors
   quilt"
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"
@@ -325,7 +361,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 --------------------------------------------------