Re: Emacs build failure

[Kai Großjohann]

"Eli Zaretskii" <address@hidden> writes:

>> From: address@hidden (Kai =?iso-8859-1?q?Gro=DFjohann?=)
>> Date: Fri, 09 Nov 2001 23:49:06 +0100
>> 
>> -emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
>> +emacs = EMACSLOADPATH=$(lisp):$(lisp)/calc $(EMACS) $(EMACSOPT)
>
> This will break non-Posix platforms, which use `;' as a separator in
> directory lists.  As Stefan has pointed out, this shouldn't be
> necessary in the first place, due to subdirs.el.

Right.

The following change (diff below signature) allows me to build Emacs
with "make bootstrap", and it builds calc, too.

Colin, what do you think?  Would this be a first step?

Note that I still have no idea whatsoever whether this calc actually
does anything useful.

kai
-- 
I like BOTH kinds of music.

Index: lisp/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile.in
--- lisp/Makefile.in    2001/11/10 13:55:22     1.24
+++ lisp/Makefile.in    2001/11/10 18:02:55
@@ -114,14 +114,14 @@
 
 setwins=subdirs=`find $$wd -type d -print`; \
        for file in $$subdirs; do \
-          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */calc ) ;; \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
                *) wins="$$wins $$file" ;; \
           esac; \
         done
 
 finder_setwins=subdirs=`find $$wd -type d -print`; \
        for file in $$subdirs; do \
-          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | 
*/term | */calc ) ;; \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | 
*/term ) ;; \
                *) wins="$$wins $$file" ;; \
           esac; \
         done
Index: lisp/subdirs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subdirs.el,v
retrieving revision 2.6
diff -u -u -r2.6 subdirs.el
--- lisp/subdirs.el     2000/12/12 15:11:04     2.6
+++ lisp/subdirs.el     2001/11/10 18:02:55
@@ -1,3 +1,3 @@
 ;; In load-path, after this directory should come
 ;; certain of its subdirectories.  Here we specify them.
-(normal-top-level-add-to-load-path '("textmodes" "progmodes" "play" "net" 
"mail" "language" "international" "gnus" "eshell" "emulation" "emacs-lisp" 
"calendar" "toolbar" "obsolete"))
+(normal-top-level-add-to-load-path '("textmodes" "progmodes" "play" "net" 
"mail" "language" "international" "gnus" "eshell" "emulation" "emacs-lisp" 
"calendar" "toolbar" "calc" "obsolete"))
Index: lisp/calc/calc-aent.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-aent.el,v
retrieving revision 1.1
diff -u -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/10 18:02:55
@@ -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 -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/10 18:02:55
@@ -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 -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/10 18:02:55
@@ -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 -u -r1.1 calc.el
--- lisp/calc/calc.el   2001/11/06 18:59:06     1.1
+++ lisp/calc/calc.el   2001/11/10 18:02:55
@@ -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)