* admin/admin.el (make-manuals): Use a pdf/ subdirectory for pdf versions.

2 files changed, 7 insertions, 4 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ccee52e6b88..4f7c90bccdf 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,6 +1,7 @@
 2013-07-05  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (make-manuals): Use a standard location for lispintro.
+	Use a pdf/ subdirectory for pdf versions.
 
 2013-06-29  Glenn Morris  <rgm@gnu.org>
 
diff --git a/admin/admin.el b/admin/admin.el
index f82897e1686..1f0e1b761d2 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -199,7 +199,8 @@ Root must be the root of an Emacs source tree."
   (let* ((dest (expand-file-name "manual" root))
 	 (html-node-dir (expand-file-name "html_node" dest))
 	 (html-mono-dir (expand-file-name "html_mono" dest))
-	 (ps-dir (expand-file-name "ps" dest)))
+	 (ps-dir (expand-file-name "ps" dest))
+	 (pdf-dir (expand-file-name "pdf" dest)))
     (when (file-directory-p dest)
       (if (y-or-n-p (format "Directory %s exists, delete it first?" dest))
 	  (delete-directory dest t)
@@ -208,23 +209,24 @@ Root must be the root of an Emacs source tree."
     (make-directory html-node-dir)
     (make-directory html-mono-dir)
     (make-directory ps-dir)
+    (make-directory pdf-dir)
     ;; Emacs manual
     (let ((texi (expand-file-name "doc/emacs/emacs.texi" root)))
       (manual-html-node texi (expand-file-name "emacs" html-node-dir))
       (manual-html-mono texi (expand-file-name "emacs.html" html-mono-dir))
-      (manual-pdf texi (expand-file-name "emacs.pdf" dest))
+      (manual-pdf texi (expand-file-name "emacs.pdf" pdf-dif))
       (manual-ps texi (expand-file-name "emacs.ps" ps-dir)))
     ;; Lisp manual
     (let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
       (manual-html-node texi (expand-file-name "elisp" html-node-dir))
       (manual-html-mono texi (expand-file-name "elisp.html" html-mono-dir))
-      (manual-pdf texi (expand-file-name "elisp.pdf" dest))
+      (manual-pdf texi (expand-file-name "elisp.pdf" pdf-dir))
       (manual-ps texi (expand-file-name "elisp.ps" ps-dir)))
     ;; Lisp intro.
     (let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root)))
       (manual-html-node texi (expand-file-name "eintr" html-node-dir))
       (manual-html-mono texi (expand-file-name "eintr.html" html-mono-dir))
-      (manual-pdf texi (expand-file-name "eintr.pdf" dest))
+      (manual-pdf texi (expand-file-name "eintr.pdf" pdf-dir))
       (manual-ps texi (expand-file-name "eintr.ps" ps-dir)))
     ;; Misc manuals
     (let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"