1. xemacs
  2. vm

Commits

fenk  committed 893e918

Put pixmaps into etc/vm/pixmaps

  • Participants
  • Parent commits fd30996
  • Branches default

Comments (0)

Files changed (2)

File Makefile

View file
 
 EXPLICIT_DOCS = $(wildcard info/*.texi)
 
-DATA_FILES = $(shell echo pixmaps/*.xpm) $(shell echo pixmaps/mime/*.xpm)
-DATA_DEST = pixmaps
+DATA_FILES = $(wildcard pixmaps/*.xpm)
+DATA_DEST = $(PACKAGE)/pixmaps
+DATA_1_FILES = $(wildcard pixmaps/mime/*.xpm)
+DATA_1_DEST = $(PACKAGE)/pixmaps/mime
 
 AUTOLOAD_PATH = lisp
 

File lisp/vm-vars.el

View file
                                 (expand-file-name vm-configure-datadir))
                            (expand-file-name "pixmaps" vm-dir)
 			   (expand-file-name "../pixmaps" vm-dir)
-                           (locate-data-directory "vm")))
-	 image-dir)
+                           (let ((d (locate-data-directory "vm")))
+                             (and d
+                                  (expand-file-name "pixmaps" d)))))
+         image-dir)
     (while image-dirs
       (setq image-dir (car image-dirs))
       (if (and image-dir