* cedet/ede/proj.el (project-compile-project): Fix filename test.

2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97a9edb6458..a1b1100a389 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 86496e239ee..bf50fe63608 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -474,7 +474,9 @@ Argument COMMAND is the command to use when compiling."
   (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