[nongnu] elpa/with-editor 54d1e816ac 7/7: make: Improve creation of autoloads file

[ELPA Syncer]

branch: elpa/with-editor
commit 54d1e816ac0f3203f0065ea9e6a551b9d103dad4
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    make: Improve creation of autoloads file
---
 lisp/Makefile | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/lisp/Makefile b/lisp/Makefile
index 8166fbe663..c2cbd78241 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -15,30 +15,16 @@ clean:
        @printf " Cleaning lisp/*...\n"
        @rm -rf $(CLEAN)
 
-define LOADDEFS_TMPL
-;;; $(PKG)-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name \
-(or (file-name-directory #$$) (car load-path))))
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; $(PKG)-autoloads.el ends here
-endef
-export LOADDEFS_TMPL
-#'
-
 $(PKG)-autoloads.el: $(ELS)
        @printf " Creating $@\n"
-       @printf "%s" "$$LOADDEFS_TMPL" > $@
-       @$(EMACS) -Q --batch --eval "(progn\
-       (setq make-backup-files nil)\
-       (setq vc-handled-backends nil)\
-       (setq default-directory (file-truename default-directory))\
-       (setq generated-autoload-file (expand-file-name \"$@\"))\
-       (setq find-file-visit-truename t)\
-       (update-directory-autoloads default-directory))"
+       @$(EMACS) -Q --batch -l autoload -l cl-lib --eval "\
+(let ((file (expand-file-name \"$@\"))\
+      (autoload-timestamps nil) \
+      (backup-inhibited t)\
+      (version-control 'never)\
+      (coding-system-for-write 'utf-8-emacs-unix))\
+  (write-region (autoload-rubric file \"package\" nil) nil file nil 'silent)\
+  (cl-letf (((symbol-function 'progress-reporter-do-update) (lambda (&rest 
_)))\
+            ((symbol-function 'progress-reporter-done) (lambda (_))))\
+    (let ((generated-autoload-file file))\
+      (update-directory-autoloads default-directory))))"