Mercurial > emacs

changeset 105527:96d5c9bceae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cedet/ede/proj.el (project-compile-project): Fix filename test.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 08 Oct 2009 22:13:42 +0000
parents e0aaf562a485
children 6d711c116f28
files lisp/ChangeLog lisp/cedet/ede/proj.el
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Oct 08 22:08:49 2009 +0000
+++ b/lisp/ChangeLog	Thu Oct 08 22:13:42 2009 +0000
@@ -1,6 +1,7 @@
 2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
 
-	* 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.
 
--- a/lisp/cedet/ede/proj.el	Thu Oct 08 22:08:49 2009 +0000
+++ b/lisp/cedet/ede/proj.el	Thu Oct 08 22:13:42 2009 +0000
@@ -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