All,
A final word on the patches I just sent out. I realize that it was
risky but I made these patches "blind". I was, at the time, unable to
verify their correctness. I made one mistake. Please, before you try
to compile up Emacs, edit lib-src/ellcc.h.in and add the missing '＠' to
the end of the ＠dll_ldo string on line 24. I also forgot to make the fix
that Marat Boshernitsan pointed out to me in make-docfile.c. Therefore,
PLEASE accept my appologies, and apply the following patch after all of
the others. Nothing changes in the ChangeLog entries or anything else.
This last patch also ensures that dump-paths.el is correct.
To apply this, from the top of your source try type patch -p1 < this_file
*** xemacs-21.2.8/lib-src/make-docfile.c.jkj Sun Jan 10 19:11:11 1999
--- xemacs-21.2.8/lib-src/make-docfile.c Sun Jan 10 19:13:55 1999
***************
*** 708,716 ****
fprintf (outfile, "\n\n");
write_c_args (outfile, buf, argbuf, minargs, maxargs);
}
- }
if (ellcc)
fprintf (outfile, "\\n\");\n\n");
}
eof:
fclose (infile);
--- 708,716 ----
fprintf (outfile, "\n\n");
write_c_args (outfile, buf, argbuf, minargs, maxargs);
}
if (ellcc)
fprintf (outfile, "\\n\");\n\n");
+ }
}
eof:
fclose (infile);
*** xemacs-21.2.8/lib-src/ellcc.h.in.jkj Sun Jan 10 19:10:58 1999
--- xemacs-21.2.8/lib-src/ellcc.h.in Sun Jan 10 18:29:26 1999
***************
*** 21,27 ****
#define ELLCC_DLL_LDFLAGS "＠dll_ldflags＠"
#define ELLCC_DLL_POST "＠dll_post＠"
#define ELLCC_DLL_LD "＠dll_ld＠"
! #define ELLCC_DLL_LDO "＠dll_ldo"
#define ELLCC_CONFIG "＠configuration＠"
#define ELLCC_EMACS_VER "＠version＠"
#define ELLCC_PROGNAME "＠PROGNAME＠"
--- 21,27 ----
#define ELLCC_DLL_LDFLAGS "＠dll_ldflags＠"
#define ELLCC_DLL_POST "＠dll_post＠"
#define ELLCC_DLL_LD "＠dll_ld＠"
! #define ELLCC_DLL_LDO "＠dll_ldo＠"
#define ELLCC_CONFIG "＠configuration＠"
#define ELLCC_EMACS_VER "＠version＠"
#define ELLCC_PROGNAME "＠PROGNAME＠"
*** xemacs-21.2.8/lisp/dump-paths.el.jkj Sun Jan 10 18:46:43 1999
--- xemacs-21.2.8/lisp/dump-paths.el Sun Jan 10 19:07:46 1999
***************
*** 67,73 ****
late-package-load-path
'()
lisp-directory
! site-directory)))
(setq module-directory (paths-find-module-directory roots))
(if debug-paths
--- 67,73 ----
late-package-load-path
'()
lisp-directory
! site-directory))
(setq module-directory (paths-find-module-directory roots))
(if debug-paths
--
J. Kean Johnston | "If equal affection cannot be,
Engineer, SPG | let the more loving one be me" - W.H. Auden
Santa Cruz, CA +----------------------------------------------------------
Tel: 831-427-7569 Fax: 831-429-1887 E-mail: jkj(a)sco.com
