# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1255039729 0
# Node ID e0aaf562a48598f992a557297126d113f8b714fe
# Parent  dbf80f6b6e39212dd91a1255dc01deeb01c51f22
* 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.

diff -r dbf80f6b6e39 -r e0aaf562a485 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 08 15:21:31 2009 +0000
+++ b/lisp/ChangeLog	Thu Oct 08 22:08:49 2009 +0000
@@ -1,3 +1,9 @@
+2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* 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  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
diff -r dbf80f6b6e39 -r e0aaf562a485 lisp/cedet/ede/proj.el
--- a/lisp/cedet/ede/proj.el	Thu Oct 08 15:21:31 2009 +0000
+++ b/lisp/cedet/ede/proj.el	Thu Oct 08 22:08:49 2009 +0000
@@ -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."