# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1255040022 0
# Node ID 96d5c9bceae984d3d245e866023a986faba3997f
# Parent  e0aaf562a48598f992a557297126d113f8b714fe
* cedet/ede/proj.el (project-compile-project): Fix filename test.

diff -r e0aaf562a485 -r 96d5c9bceae9 lisp/ChangeLog
--- 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.
 
diff -r e0aaf562a485 -r 96d5c9bceae9 lisp/cedet/ede/proj.el
--- 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