X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lib-src%2Fupdate-custom.sh;h=dd62a86b5a447ca32ff4117fca181ba7bcce5557;hp=7e0a2eab0cd614107058ef7c63031d6824009054;hb=a5f466de30a3e927ed1146b0c7e3870e71465c8f;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910 diff --git a/lib-src/update-custom.sh b/lib-src/update-custom.sh index 7e0a2ea..dd62a86 100755 --- a/lib-src/update-custom.sh +++ b/lib-src/update-custom.sh @@ -45,13 +45,20 @@ echo " (using $EMACS)" export EMACS -REAL=`cd \`dirname $EMACS\` ; pwd | sed 's|^/tmp_mnt||'`/`basename $EMACS` +EMACS_DIR=`cd \`dirname $EMACS\` && pwd`; +# Account for various system automounter configurations +if test -d "/net"; then + if test -d "/tmp_mnt/net"; then tdir="/tmp_mnt/net"; else tdir="/tmp_mnt"; fi + EMACS_DIR=`echo "$EMACS_DIR" | \ + sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"` +fi +REAL="$EMACS_DIR/`basename $EMACS`" echo "Rebuilding custom-loads with $REAL..." if [ "`uname -r | sed 's/\(.\).*/\1/'`" -gt 4 ]; then echon() - { + { /bin/echo $* '\c' } else @@ -62,12 +69,7 @@ else fi # Compute patterns to ignore when searching for files -# These directories don't have customizations, or are partially broken. -# If some of the packages listed here are customized, don't forget to -# remove the directory! -ignore_dirs="cl egg eos its language locale sunpro term \ -tooltalk iso electric \ -hm--html-menus gnats pcl-cvs vm" +ignore_dirs="" # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. echon "Checking for Mule support..." @@ -75,7 +77,7 @@ lisp_prog='(princ (featurep (quote mule)))' mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No - ignore_dirs="$ignore_dirs mule leim skk" + ignore_dirs="$ignore_dirs mule" else echo Yes fi