From xemacs-m  Tue Mar  4 19:48:20 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id TAA23824
	for <xemacs-beta@xemacs.org>; Tue, 4 Mar 1997 19:48:18 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id RAA20881;
	Tue, 4 Mar 1997 17:59:52 -0800
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: 20.1-b5 and 19.15-b97 are totally broken with --srcdir
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
Mime-Version: 1.0 (generated by tm-edit 7.105)
Content-Type: text/plain; charset=US-ASCII
Date: 04 Mar 1997 17:59:47 -0800
Message-ID: <m2u3mrrtd8.fsf@altair.xemacs.org>
Lines: 78
X-Mailer: Gnus v5.4.17/XEmacs 20.1

Patch for 20.1 follows.

Index: src/Makefile.in.in
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/src/Makefile.in.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in.in
--- Makefile.in.in	1997/03/04 08:01:35	1.10
+++ Makefile.in.in	1997/03/05 01:30:44
@@ -83,7 +83,7 @@
 vpath config.h
 vpath paths.h
 vpath Emacs.ad.h
-vpath PURESIZE.h
+vpath puresize_adjust.h
 #else
 VPATH=@srcdir@
 #endif
@@ -1377,7 +1377,7 @@
 ${libsrc}DOC: ${libsrc}make-docfile ${obj_src} ${mule_obj_src} ${lisp}
 #endif
 	rm -f ${libsrc}DOC
-	${libsrc}make-docfile -d ${srcdir} -i ${lispdir}site-packages \
+	${libsrc}make-docfile -d ${srcdir} -i ${lispdir}../site-packages \
 		${obj_src} ${mule_obj_src} \
 	        ${mallocdocsrc} ${rallocdocsrc} ${lispdir}version.el \
 		${lisp} > ${libsrc}DOC

Index: src/puresize.h
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/src/puresize.h,v
retrieving revision 1.9
diff -u -r1.9 puresize.h
--- puresize.h	1997/03/04 02:30:30	1.9
+++ puresize.h	1997/03/05 01:42:49
@@ -167,7 +167,7 @@
   
 #endif /* !RAW_PURESIZE */
   
-#include "puresize_adjust.h"
+#include <puresize_adjust.h>
 #define PURESIZE ((RAW_PURESIZE) + (PURESIZE_ADJUSTMENT))
 
 
Index: src/alloc.c
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/src/alloc.c,v
retrieving revision 1.5
diff -u -r1.5 alloc.c
--- alloc.c	1997/03/04 02:30:17	1.5
+++ alloc.c	1997/03/05 01:44:09
@@ -2614,7 +2614,7 @@
   }
 
   write(fd, WARNING, strlen(WARNING));
-  sprintf(define_PURESIZE, "# define PURESIZE_ADJUSTMENT %ld\n",
+  sprintf(define_PURESIZE, "# define PURESIZE_ADJUSTMENT (%ld)\n",
 	  puresize - RAW_PURESIZE);
   write(fd, define_PURESIZE, strlen(define_PURESIZE));
   close(fd);
@@ -2631,11 +2631,9 @@
       CONST long report_round = 5000;
 
       message ("\n****\tPure Lisp storage exhausted!\n"
- "\tAn additional %ld bytes will guarantee enough pure space;\n"
- "\ta smaller increment may work (due to structure-sharing).\n"
+"\tPurespace usage: %ld of %ld\n"
  "****",
-               (((pure_lossage + report_round - 1)
-                 / report_round) * report_round));
+               PURESIZE+pure_lossage, PURESIZE);
       if (die_if_pure_storage_exceeded) {
 	PURESIZE_h(PURESIZE + pure_lossage);
 	rc = -1;

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

