[gentoo-commits] gentoo-x86 commit in app-emacs/vm/files: 50vm-gentoo-8.0.el vm-8.2.0_beta-datadir.patch 50vm-gentoo.el

[gentoo-commits] gentoo-x86 commit in app-emacs/vm/files: 50vm-gentoo-8.0.el vm-8.2.0_beta-datadir.patch 50vm-gentoo.el

[Ulrich Mueller (ulm)]

ulm         11/12/29 22:10:35

  Modified:             50vm-gentoo.el
  Added:                50vm-gentoo-8.0.el vm-8.2.0_beta-datadir.patch
  Log:
  Version bump.
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  app-emacs/vm/files/50vm-gentoo.el

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?r1=1.4&r2=1.5

Index: 50vm-gentoo.el
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 50vm-gentoo.el	10 Sep 2009 08:32:37 -0000	1.4
+++ 50vm-gentoo.el	29 Dec 2011 22:10:34 -0000	1.5
@@ -1,4 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITEETC@")
-(setq vm-image-directory "@SITEETC@")
 (require 'vm-autoloads)



1.1                  app-emacs/vm/files/50vm-gentoo-8.0.el

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo-8.0.el?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo-8.0.el?rev=1.1&content-type=text/plain

Index: 50vm-gentoo-8.0.el
===================================================================
(add-to-list 'load-path "@SITELISP@")
(setq vm-toolbar-pixmap-directory "@SITEETC@")
(setq vm-image-directory "@SITEETC@")
(require 'vm-autoloads)



1.1                  app-emacs/vm/files/vm-8.2.0_beta-datadir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch?rev=1.1&content-type=text/plain

Index: vm-8.2.0_beta-datadir.patch
===================================================================
--- vm-8.2.0b-orig/lisp/Makefile.in
+++ vm-8.2.0b/lisp/Makefile.in
@@ -96,7 +96,10 @@
 datadir= @datadir@
 datarootdir= @datarootdir@
 lispdir = @lispdir@
+etcdir= @etcdir@
 pixmapdir= @pixmapdir@
+docdir = @docdir@
+infodir = @infodir@
 
 EMACS_PROG = @EMACS_PROG@
 EMACS_FLAVOR = @EMACS_FLAVOR@
@@ -137,7 +140,7 @@
 	 "$(EMACS_PROG)" $(FLAGS) -l autoload \
 		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
 	echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
-	echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@
+	echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@
 	echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
 	echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
@@ -168,7 +171,7 @@
 	cat $@.tmp >> $@
 	echo "(setq features (delete 'vm-autoloads features))" >> $@
 	echo "(require 'vm-vars)" >> $@
-	echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
+	echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@
 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
 	$(RM) $@.tmp