Merge branch 'master' of ustrat:git/staging/profile

[profile] / setup

diff --git a/setup b/setup
index 6ea2987..d1393df 100755 (executable)
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/ftp/pub/mdw/profile}
+: ${REPO=http://ftp.distorted.org.uk/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
@@ -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,25 +133,30 @@ 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
   gdbinit
   guile
+  rcrc
   toprc
+  mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
   aspell.conf
+  tclshrc:.tclshrc tclshrc:.wishrc
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     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
+  mdw.session:.config/gnome-session/sessions/mdw.session
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
@@ -171,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
@@ -182,12 +191,12 @@ for d in $dotfilessubst; do
   dir=${ft%/*}
   mkdir -p $dir
   sed "
-1i\
-### generated by $here/setup; do not edit!\
+1i\\
+### generated by $here/setup; do not edit!\\
 
 /@home@/ s\a\a$HOME\ag
-/@releasekey@/ s\a\a$(bin/mdw-conf release-key 481334C2)\ag
-/@gitignore@/ s\a\a$(bin/mdw-conf gitignore $here/git/gitignore)\ag
+/@profile@/ s\a\a$here\ag
+/@releasekey@/ s\a\a$(bin/mdw-conf releasekey 481334C2)\ag
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
@@ -228,11 +237,13 @@ scripts="
   mdw-build
   emacsclient-hack
   movemail-hack
+  sendmail-hack
   aspell-hack
   emerge-hack
   lesspipe.sh
   start-ssh-agent
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
@@ -320,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 --------------------------------------------------