From e2dc7d6a6f51a28b78517c591c1e3f5d9169e857 Mon Sep 17 00:00:00 2001
From: "Tom Breton (Tehom)" <tehom@panix.com>
Date: Fri, 12 Nov 2010 12:15:33 -0500
Subject: [PATCH] Bugfixes: Byte-compile setup and fixed misc compile errors

---
 elinstall.el | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/elinstall.el b/elinstall.el
index df54f4c..d152c93 100644
--- a/elinstall.el
+++ b/elinstall.el
@@ -653,11 +653,11 @@ BASENAME and PRIORITY are used as arguments to
       ;;Dispatch the possibilities.
       (cond
 	 ((eq preload-target 'dot-emacs)
-	    (elinstall-add-to-dot-emacs "~/.emacs" filename))
+	    (elinstall-add-to-dot-emacs "~/.emacs" filename force))
 	 ((stringp preload-target)
 	    (elinstall-symlink-on-emacs-start 
 	       filename basename preload-target priority force))
-	 (null preload-target
+	 ((null preload-target)
 	    (message "Not arranging for preloads"))
 	 (t
 	    (message "I don't recognize that")))))
@@ -867,13 +867,14 @@ LOAD-PATH-ELEMENT, DIR, and PARAMETERS are interpreted as in
 		     ;;$$PUNT - currently, we wouldn't have gotten
 		     ;;here if we weren't intending to do everything.
 		     (recompile-p nil)
-		     (compile-new t)))
-	       
-		(if (file-exists-p dest)
-		   ;; File was already compiled.
-		   (or recompile-p (file-newer-than-file-p source dest))
-		   (or compile-new
-		      (y-or-n-p (concat "Compile " source "? ")))))))
+		     (compile-new t))
+		  (if (file-exists-p dest)
+		     ;; File was already compiled.
+		     (or recompile-p (file-newer-than-file-p full-path dest))
+		     (or compile-new
+			(y-or-n-p (concat "Compile " filename "? "))))))))
+      
+      
       (list
 	 (if compile-p
 	    `(byte-compile ,full-path)
@@ -1063,6 +1064,8 @@ surrounds DIR.  It may not yet have been added to load-path."
       (elinstall-stage-arrange-preloads
 	 (elinstall-stages->arrange-preloads stages)
 	 (elinstall-get-deffile-list stages))
+      (elinstall-stage-byte-compile
+	 (elinstall-stages->byte-compile stages))
       t))
 ;;;_ , Entry points
 ;;;_  . elinstall
@@ -1100,6 +1103,8 @@ development."
 
 
 ;;;_  . elinstall-update-directory-autoloads
+;;$$SPLIT ME - one to just classically update autoloads, one to
+;;install a file.
 ;;$$TEST ME
 ;;;###autoload
 (defun elinstall-update-directory-autoloads (dir)
@@ -1120,6 +1125,8 @@ development."
 
 
 ;;;_  . elinstall-update-file-autoloads
+;;$$SPLIT ME - one to just classically update autoloads, one to
+;;install a file.
 ;;$$TEST ME
 ;;;###autoload
 (defun elinstall-update-file-autoloads (file)
@@ -1132,7 +1139,7 @@ development."
 	    (elinstall-maybe-get-deffile file)
 	    (elinstall-expand-deffile-name 
 	       generated-autoload-file))))
-      (elinstall 
+      (elinstall-x
 	 file
 	 `(def-file ,def-file-name (nil) (file ,file)))))
 ;;;_. Footers
-- 
2.11.4.GIT