Fix last changes to support whitespace in directory names.

 lisp/Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
 ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
 ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Call
 unmsys--file-name before expand-file-name, not after it.

2 files changed, 12 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 587535e328e..2a818f2f12c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
+        ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
+        ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Call
+        unmsys--file-name before expand-file-name, not after it.
+
 2013-10-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * emacs-lisp/ert.el (ert-deftest): Bind macro `skip-unless'.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 89cc26ed4ae..a7f63f4f7b5 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -381,7 +381,7 @@ mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
 $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
-           --eval "(setq generated-autoload-file (unmsys--file-name (expand-file-name \"$@\")))" \
+           --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(MH_E_DIR)
 
@@ -399,7 +399,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el    $(TRAMP_DIR)/tramp-adb.el	\
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
-           --eval "(setq generated-autoload-file (unmsys--file-name (expand-file-name \"$@\")))" \
+           --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(TRAMP_DIR)
 
@@ -421,21 +421,21 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el  \
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
-           --eval "(setq generated-autoload-file (unmsys--file-name (expand-file-name \"$@\")))" \
+           --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
-           --eval "(setq generated-autoload-file (unmsys--file-name (expand-file-name \"$@\")))" \
+           --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
         $(emacs) -l autoload \
            --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
-           --eval "(setq generated-autoload-file (unmsys--file-name (expand-file-name \"$@\")))" \
+           --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(CAL_DIR)