User: daiki
Date: 05/03/20 23:32:39
Modified: packages/xemacs-packages/riece/lisp ChangeLog
riece-toolbar.el
Log:
riece: fix location of *.xpm files
Revision Changes Path
1.17 +4 -0 XEmacs/packages/xemacs-packages/riece/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ChangeLog 2005/03/20 11:33:14 1.16
+++ ChangeLog 2005/03/20 22:32:35 1.17
@@ -1,3 +1,7 @@
+2005-03-20 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Makefile (DATA_DEST): Put *.xpm files into etc/riece/.
+
2005-03-20 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.18 released.
1.18 +2 -1 XEmacs/packages/xemacs-packages/riece/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Makefile 2005/03/20 11:33:14 1.17
+++ Makefile 2005/03/20 22:32:35 1.18
@@ -62,6 +62,7 @@ endif
PRELOADS = -eval \("push \"./lisp\" load-path"\)
-DATA_1_FILES = $(wildcard lisp/*.xpm)
+DATA_FILES = $(wildcard lisp/*.xpm)
+DATA_DEST = $(PACKAGE)
include ../../XEmacs.rules
1.7 +5 -0 XEmacs/packages/xemacs-packages/riece/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ChangeLog 2005/03/20 09:11:20 1.6
+++ ChangeLog 2005/03/20 22:32:38 1.7
@@ -1,3 +1,8 @@
+2005-03-20 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-toolbar.el [XEmacs] (riece-make-toolbar-from-menu):
+ Pick up toolbar icons from etc/riece/.
+
2005-03-06 Daiki Ueno <ueno(a)unixuser.org>
* Riece: Version 1.0.8 released.
1.2 +6 -2 XEmacs/packages/xemacs-packages/riece/lisp/riece-toolbar.el
Index: riece-toolbar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-toolbar.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- riece-toolbar.el 2005/03/20 09:11:24 1.1
+++ riece-toolbar.el 2005/03/20 22:32:38 1.2
@@ -62,10 +62,14 @@
(let ((pointer items)
toolbar
file
- menu-item)
+ menu-item
+ (riece-data-directory (locate-data-directory "riece")))
(while pointer
(setq file (locate-file (symbol-name (car pointer))
- load-path
+ (if riece-data-directory
+ (cons riece-data-directory
+ load-path)
+ load-path)
'(".xpm" ".pbm" ".xbm"))
menu-item (riece-toolbar-find-menu-item (car pointer)))
(if (and file (file-exists-p file))