X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/73165cde4740aae25bcbe379c8f3ad2e6d3d8d5f..d4e04126f8385099f92708dcce5b2250b071ad6b:/setup diff --git a/setup b/setup index 705e396..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" @@ -175,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 @@ -238,6 +242,7 @@ scripts=" lesspipe.sh start-ssh-agent svnwrap + guest-console hyperspec" [ "$xstuff" ] && scripts="$scripts xinitcmd @@ -325,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 --------------------------------------------------