(w32-batch-update-autoloads): Take autoload-make-program from the

second command-line argument.

2 files changed, 12 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a564eabfbd4..e01bc0abcaa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2009-10-15  Glenn Morris  <rgm@gnu.org>
 
+        * w32-fns.el (w32-batch-update-autoloads): Take autoload-make-program
+        from the second command-line argument.
+        * makefile.w32-in (autoloads, $(lisp)/calendar/cal-loaddefs.el)
+        ($(lisp)/calendar/diary-loaddefs.el, $(lisp)/calendar/hol-loaddefs.el)
+        ($(lisp)/mh-e/mh-loaddefs.el): Pass $(MAKE) as second argument to
+        w32-batch-update-autoloads.
+        * emacs-lisp/autoload.el (autoload-make-program): New variable.
+        (batch-update-autoloads): Handle autoload-excludes on windows-nt.
+
         * mail/rmailedit.el (rmail-cease-edit): Give an error if the end of
         the headers cannot be located.  Simplify, subtracting superflous
         save-excursions.
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index f1579a97663..5462681551c 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -490,7 +490,9 @@ This is required because some Windows build environments, such as MSYS,
 munge command-line arguments that include file names to a horrible mess
 that Emacs is unable to cope with."
   (let ((generated-autoload-file
-         (expand-file-name (pop command-line-args-left))))
+         (expand-file-name (pop command-line-args-left)))
+        ;; I can only assume the same considerations may apply here...
+        (autoload-make-program (pop command-line-args-left)))
     (batch-update-autoloads)))
 
 (defun w32-append-code-lines (orig extra)