[Packages] liece: Preloads in Makefile.lisp, handle nil values
I don't know if there are correct. I haven't tried to run the
package. I applied these to successfully build under make World with
the correct use of PRELOADS and REQUIRES in package-compile.el.
Index: xemacs-packages/liece/lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/liece/lisp/ChangeLog,v
retrieving revision 1.5
diff -u -U0 -r1.5 ChangeLog
--- xemacs-packages/liece/lisp/ChangeLog 2002/04/08 08:40:22 1.5
+++ xemacs-packages/liece/lisp/ChangeLog 2002/05/04 14:46:25
＠＠ -0,0 +1,8 ＠＠
+2002-05-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * liece-make.el (config-liece-package-directory):
+ * liece-config.el (PACKAGEDIR):
+ Handle case when dirs is nil.
+
+ * Makefile.lisp (package): Preload advice.
+
Index: xemacs-packages/liece/lisp/Makefile.lisp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/liece/lisp/Makefile.lisp,v
retrieving revision 1.2
diff -u -r1.2 Makefile.lisp
--- xemacs-packages/liece/lisp/Makefile.lisp 2002/03/25 03:04:15 1.2
+++ xemacs-packages/liece/lisp/Makefile.lisp 2002/05/04 14:46:28
＠＠ -35,7 +35,7 ＠＠
package:
$(XEMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \
$(PREFIX) $(LISPDIR)
- $(XEMACS) $(FLAGS) -l ./liece-make.el -f compile-liece-package \
+ $(XEMACS) $(FLAGS) -l ./liece-make.el -l advice -f compile-liece-package \
$(PACKAGEDIR)
install-package: package
Index: xemacs-packages/liece/lisp/liece-config.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/liece/lisp/liece-config.el,v
retrieving revision 1.1
diff -u -r1.1 liece-config.el
--- xemacs-packages/liece/lisp/liece-config.el 2002/03/23 05:51:22 1.1
+++ xemacs-packages/liece/lisp/liece-config.el 2002/05/04 14:46:28
＠＠ -85,7 +85,7 ＠＠
(if last-package-load-path
last-packages)))
dir)
- (while (not (file-exists-p (setq dir (car dirs))))
+ (while (and dirs (not (file-exists-p (setq dir (car dirs)))))
(setq dirs (cdr dirs)) )
dir )))
Index: xemacs-packages/liece/lisp/liece-make.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/liece/lisp/liece-make.el,v
retrieving revision 1.1
diff -u -r1.1 liece-make.el
--- xemacs-packages/liece/lisp/liece-make.el 2002/03/23 05:51:30 1.1
+++ xemacs-packages/liece/lisp/liece-make.el 2002/05/04 14:46:28
＠＠ -145,8 +145,8 ＠＠
(if last-package-load-path
last-packages)))
dir)
- (while (not (file-exists-p
- (setq dir (car dirs))))
+ (while (and dirs (not (file-exists-p
+ (setq dir (car dirs)))))
(setq dirs (cdr dirs)))
(defvar PACKAGEDIR dir)
(princ (format "PACKAGEDIR=%s\n" PACKAGEDIR)))))
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
My nostalgia for Icon makes me forget about any of the bad things. I don't
have much nostalgia for Perl, so its faults I remember. Scott Gilbert c.l.py