X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/82c688c7806ff740ff21084d166c0bc50047d80b..d4e04126f8385099f92708dcce5b2250b071ad6b:/setup

diff --git a/setup b/setup
index 2cee341..cf9dc4c 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"
@@ -138,7 +141,9 @@ dotfiles="
   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
@@ -150,6 +155,7 @@ dotfiles="
   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
@@ -172,6 +178,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
@@ -183,12 +190,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$HOMEg
+/@profile@/ s$hereg
 /@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
-/@gitignore@/ s$(bin/mdw-conf gitignore $here/git/gitignore)g
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
@@ -235,6 +242,7 @@ scripts="
   lesspipe.sh
   start-ssh-agent
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
@@ -322,7 +330,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 --------------------------------------------------