2 files changed, 9 insertions, 11 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f6f25f26733..8746657517e 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -4,6 +4,8 @@
         (manual-txt): Remove.
         (manual-pdf): Doc fix.
         (manual-ps): Rename from manual-dvi.
+        (manual-pdf, manual-ps): Work in the directory with the texi file,
+        so that TeX intermediate files go there rather than to PWD.
 
 2013-06-15  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/admin/admin.el b/admin/admin.el
index 0447b95217e..2bc4955810d 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -334,21 +334,17 @@ the @import directive."
 
 (defun manual-pdf (texi-file dest)
   "Run texi2pdf on TEXI-FILE, emitting pdf output to DEST."
-  (call-process "texi2pdf" nil nil nil
-                "-I" (expand-file-name "../emacs"
-                                       (file-name-directory texi-file))
-                "-I" (expand-file-name "../misc"
-                                       (file-name-directory texi-file))
-                texi-file "-o" dest))
+  (let ((default-directory (file-name-directory texi-file)))
+    (call-process "texi2pdf" nil nil nil
+                  "-I" "../emacs" "-I" "../misc"
+                  texi-file "-o" dest)))
 
 (defun manual-ps (texi-file dest)
   "Generate a PostScript version of TEXI-FILE as DEST."
-  (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi")))
+  (let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi"))
+        (default-directory (file-name-directory texi-file)))
     (call-process "texi2dvi" nil nil nil
-                  "-I" (expand-file-name "../emacs"
-                                         (file-name-directory texi-file))
-                  "-I" (expand-file-name "../misc"
-                                         (file-name-directory texi-file))
+                  "-I" "../emacs" "-I" "../misc"
                   texi-file "-o" dvi-dest)
     (call-process "dvips" nil nil nil dvi-dest "-o" dest)
     (delete-file dvi-dest)