From 20eb0692e4ad9017b2f1e73e5e726d9cd7f65b70 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 23 Mar 2006 14:09:48 +0000
Subject: [PATCH] setup: Fix Emacs package installation.

---
 setup | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setup b/setup
index b9adf91..a57edc8 100755
--- 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 '
-       (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"
-    $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 \
-	--eval '(byte-compile-file "make-regexp.el")')
+	--eval '(byte-compile-file "'"$elib.el"'")')
     echo " done."
   fi
 done
-- 
2.11.0