[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj.el |
Date: |
Thu, 08 Oct 2009 22:13:46 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/08 22:13:45
Modified files:
lisp : ChangeLog
lisp/cedet/ede : proj.el
Log message:
* cedet/ede/proj.el (project-compile-project): Fix filename test.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16390&r2=1.16391
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj.el?cvsroot=emacs&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16390
retrieving revision 1.16391
diff -u -b -r1.16390 -r1.16391
--- ChangeLog 8 Oct 2009 22:08:49 -0000 1.16390
+++ ChangeLog 8 Oct 2009 22:13:42 -0000 1.16391
@@ -1,6 +1,7 @@
2009-10-08 Chong Yidong <address@hidden>
- * cedet/ede/proj.el (project-make-dist): Fix filename test.
+ * cedet/ede/proj.el (project-make-dist, project-compile-project):
+ Fix filename test.
(ede-proj-dist-makefile): Use expand-file-name instead of concat
to expand file names.
Index: cedet/ede/proj.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cedet/ede/proj.el 8 Oct 2009 22:08:53 -0000 1.6
+++ cedet/ede/proj.el 8 Oct 2009 22:13:45 -0000 1.7
@@ -474,7 +474,9 @@
(let ((pm (ede-proj-dist-makefile proj))
(default-directory (file-name-directory (oref proj file))))
(ede-proj-setup-buildenvironment proj)
- (if (string= pm "Makefile.am") (setq pm "Makefile"))
+ (if (string= (file-name-nondirectory pm) "Makefile.am")
+ (setq pm (expand-file-name "Makefile"
+ (file-name-directory pm))))
(compile (concat ede-make-command" -f " pm " all"))))
;;; Target type specific compilations/debug