setup: Fix Emacs package installation.

diff --git a/setup b/setup
index b9adf9141f57fd2de607253510cc27e68b51a9a4..a57edc8b4b63858692ad487c8b77d491a4d6d82a 100755 (executable)
--- a/setup
+++ b/setup
@@ -194,18 +194,19 @@ emacspkg="
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"
   if $false $emacs >/dev/null 2>&1 --no-site-file --batch --eval '
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"
   if $false $emacs >/dev/null 2>&1 --no-site-file --batch --eval '

-       (setq load-path (nconc load-path (list "~/lib/emacs")))
-       (kill-emacs (condition-case nil
-                      (progn (load-library "make-regexp") 0)
-                    (error 1)))'; then
+       (progn
+         (setq load-path (nconc load-path (list "~/lib/emacs")))
+         (kill-emacs (condition-case nil
+                        (progn (load-library "'"$elib"'") 0)
+                      (error 1))))'; then

     echo " already installed."
   else
     $echon " downloading$echoc"
     echo " already installed."
   else
     $echon " downloading$echoc"

-    $GETURL $HOME$sub/lib/emacs/make-regexp.el $REPO/make-regexp.el
+    $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el

     $echon " compiling$echoc"
     (cd $HOME$sub/lib/emacs;
       $emacs >/dev/null 2>&1 --no-site-file --batch \
     $echon " compiling$echoc"
     (cd $HOME$sub/lib/emacs;
       $emacs >/dev/null 2>&1 --no-site-file --batch \

-       --eval '(byte-compile-file "make-regexp.el")')
+       --eval '(byte-compile-file "'"$elib.el"'")')

     echo " done."
   fi
 done
     echo " done."
   fi
 done