diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/cedet/ede/proj.el | 4 |
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 @@ | |||
| 1 | 2009-10-08 Chong Yidong <cyd@stupidchicken.com> | 1 | 2009-10-08 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * cedet/ede/proj.el (project-make-dist): Fix filename test. | 3 | * cedet/ede/proj.el (project-make-dist, project-compile-project): |
| 4 | Fix filename test. | ||
| 4 | (ede-proj-dist-makefile): Use expand-file-name instead of concat | 5 | (ede-proj-dist-makefile): Use expand-file-name instead of concat |
| 5 | to expand file names. | 6 | to expand file names. |
| 6 | 7 | ||
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." | |||
| 474 | (let ((pm (ede-proj-dist-makefile proj)) | 474 | (let ((pm (ede-proj-dist-makefile proj)) |
| 475 | (default-directory (file-name-directory (oref proj file)))) | 475 | (default-directory (file-name-directory (oref proj file)))) |
| 476 | (ede-proj-setup-buildenvironment proj) | 476 | (ede-proj-setup-buildenvironment proj) |
| 477 | (if (string= pm "Makefile.am") (setq pm "Makefile")) | 477 | (if (string= (file-name-nondirectory pm) "Makefile.am") |
| 478 | (setq pm (expand-file-name "Makefile" | ||
| 479 | (file-name-directory pm)))) | ||
| 478 | (compile (concat ede-make-command" -f " pm " all")))) | 480 | (compile (concat ede-make-command" -f " pm " all")))) |
| 479 | 481 | ||
| 480 | ;;; Target type specific compilations/debug | 482 | ;;; Target type specific compilations/debug |