Re: Emacs build failure

[Kai Großjohann]

Colin Walters <address@hidden> writes:

> Right.  Mmm.  Calc has a pretty complex compilation process.  It will
> take me a bit of time to get it so that we can actually just build
> calc by compiling all the files in the directory.  I hadn't realized
> how tricky this would be at first.

I have made the following changes, and now my usual build script
finishes and produces a working Emacs.  However, I'm almost sure that
the calc that comes with that Emacs is not working.  But it might be
a start so that others can do `make bootstrap' again?

Hm.  The change in calc-macs.el might be superfluous, and I'm sorry
about the unneeded line breaking changes in calc.el.

Thoughts?

Index: lisp/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.23
diff -u -r1.23 Makefile.in
--- lisp/Makefile.in    2001/08/15 09:06:32     1.23
+++ lisp/Makefile.in    2001/11/09 22:45:08
@@ -108,7 +108,7 @@
 
 # The actual Emacs command run in the targets below.
 
-emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
+emacs = EMACSLOADPATH=$(lisp):$(lisp)/calc $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
 
cvs server: Diffing lisp/calc
Index: lisp/calc/calc-aent.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-aent.el,v
retrieving revision 1.1
diff -u -r1.1 calc-aent.el
--- lisp/calc/calc-aent.el      2001/11/06 18:59:06     1.1
+++ lisp/calc/calc-aent.el      2001/11/09 22:47:13
@@ -25,6 +25,7 @@
 (require 'calc)
 
 (require 'calc-macs)
+(eval-when-compile '(require calc-macs))
 
 (defun calc-Need-calc-aent () nil)
 
Index: lisp/calc/calc-ext.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-ext.el,v
retrieving revision 1.1
diff -u -r1.1 calc-ext.el
--- lisp/calc/calc-ext.el       2001/11/06 18:59:06     1.1
+++ lisp/calc/calc-ext.el       2001/11/09 22:47:13
@@ -22,6 +22,7 @@
 
 
 (provide 'calc-ext)
+(require 'calc)
 
 (setq calc-extensions-loaded t)
 
Index: lisp/calc/calc-macs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-macs.el,v
retrieving revision 1.1
diff -u -r1.1 calc-macs.el
--- lisp/calc/calc-macs.el      2001/11/06 18:59:06     1.1
+++ lisp/calc/calc-macs.el      2001/11/09 22:47:13
@@ -26,10 +26,9 @@
 
 
 (defmacro calc-record-compilation-date-macro ()
-  (` (setq calc-installed-date (, (concat (current-time-string)
-                                         " by "
-                                         (user-full-name)))))
-)
+  `(setq calc-installed-date ,(concat (current-time-string)
+                                     " by "
+                                     (user-full-name))))
 
 
 (defmacro calc-wrapper (&rest body)
Index: lisp/calc/calc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.1
diff -u -r1.1 calc.el
--- lisp/calc/calc.el   2001/11/06 18:59:06     1.1
+++ lisp/calc/calc.el   2001/11/09 22:47:13
@@ -67,11 +67,10 @@
 
 
 (provide 'calc)
+(require 'calc-macs)
 
-
 (defun calc-record-compilation-date ()
-  (calc-record-compilation-date-macro)
-)
+  (calc-record-compilation-date-macro))
 (calc-record-compilation-date)
 
 


kai
-- 
I like BOTH kinds of music.