[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/proj.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/08 22:08:53

Modified files:
        lisp           : ChangeLog 
        lisp/cedet/ede : proj.el 

Log message:
        * cedet/ede/proj.el (project-make-dist): Fix filename test.
        (ede-proj-dist-makefile): Use expand-file-name instead of concat
        to expand file names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16389&r2=1.16390
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/proj.el?cvsroot=emacs&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16389
retrieving revision 1.16390
diff -u -b -r1.16389 -r1.16390
--- ChangeLog   8 Oct 2009 15:21:31 -0000       1.16389
+++ ChangeLog   8 Oct 2009 22:08:49 -0000       1.16390
@@ -1,3 +1,9 @@
+2009-10-08  Chong Yidong  <address@hidden>
+
+       * cedet/ede/proj.el (project-make-dist): Fix filename test.
+       (ede-proj-dist-makefile): Use expand-file-name instead of concat
+       to expand file names.
+
 2009-10-08  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)

Index: cedet/ede/proj.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/proj.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/ede/proj.el   2 Oct 2009 10:53:34 -0000       1.5
+++ cedet/ede/proj.el   8 Oct 2009 22:08:53 -0000       1.6
@@ -456,9 +456,10 @@
             (not (y-or-n-p "Dist file already exists.  Rebuild? ")))
        (error "Try `ede-update-version' before making a distribution"))
     (ede-proj-setup-buildenvironment this)
-    (if (string= pm "Makefile.am") (setq pm "Makefile"))
-    (compile (concat ede-make-command " -f " pm " dist"))
-    ))
+    (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 " dist"))))
 
 (defmethod project-dist-files ((this ede-proj-project))
   "Return a list of files that constitutes a distribution of THIS project."
@@ -597,11 +598,11 @@
         (concat (file-name-directory (oref this file))
                 "Makefile.am"))
        ((eq (oref this makefile-type) 'Makefile.in)
-        (concat (file-name-directory (oref this file))
-                "Makefile.in"))
+        (expand-file-name "Makefile.in"
+                          (file-name-directory (oref this file))))
        ((object-assoc "Makefile" 'makefile (oref this targets))
-        (concat (file-name-directory (oref this file))
-                "Makefile"))
+        (expand-file-name "Makefile"
+                          (file-name-directory (oref this file))))
        (t
         (let ((targets (oref this targets)))
           (while (and targets
@@ -610,8 +611,8 @@
                             'ede-proj-target-makefile)))
             (setq targets (cdr targets)))
           (if targets (oref (car targets) makefile)
-            (concat (file-name-directory (oref this file))
-                    "Makefile"))))))
+            (expand-file-name "Makefile"
+                              (file-name-directory (oref this file))))))))
 
 (defun ede-proj-regenerate ()
   "Regenerate Makefiles for and edeproject project."