dot/emacs: Recognize `@BASH@' in shebang lines.

[profile] / setup

diff --git a/setup b/setup
index 74db46e..f84d799 100755 (executable)
--- 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"
@@ -146,6 +149,7 @@ 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
@@ -175,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
@@ -190,8 +195,8 @@ for d in $dotfilessubst; do
 ### 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"
@@ -238,6 +243,7 @@ scripts="
   lesspipe.sh
   start-ssh-agent
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
@@ -325,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 --------------------------------------------------