[AUCTeX-devel] Re: preview-datadir and XEmacs

[Ralf Angeli]

* David Kastrup (2006-03-21) writes:

> Maybe.  If you want to try something, feel free to do so.

The following patch fixes the bug for me.  The way preview/auto.el is
being passed to `preview-make-package' (or not) might be considered
peculiar.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/auctex/auctex/Makefile.in,v
retrieving revision 1.130
diff -u -r1.130 Makefile.in
--- Makefile.in 23 Jan 2006 13:48:40 -0000      1.130
+++ Makefile.in 21 Mar 2006 19:23:16 -0000
@@ -224,7 +224,7 @@
 install-metadata:
        test "x$(packagedir)" = xno || { \
          $(MKINSTALLDIRS) $(DESTDIR)$(packagedir)/pkginfo || : ; \
-         $(ELCC) -l preview/prv-install -f preview-make-package 
$(DESTDIR)$(packagedir) "$(PACKAGE)" \"`echo $(AUCTEXDATE)|sed 
's/\(.*\)-\(.*\)-\(.*\)/\1.\2\3/'`\" \"$(AUCTEXVERSION)\" tex-site.el && \
+         $(ELCC) -l preview/prv-install -f preview-make-package 
$(DESTDIR)$(packagedir) "$(PACKAGE)" \"`echo $(AUCTEXDATE)|sed 
's/\(.*\)-\(.*\)-\(.*\)/\1.\2\3/'`\" \"$(AUCTEXVERSION)\" tex-site.el `{ test 
"x$(preview_enabled)" != xyes || echo "preview/auto.el"; }` && \
          cd $(DESTDIR)$(packagedir) && \
          find "etc/$(PACKAGE)" "lisp/$(PACKAGE)" -print 
>"pkginfo/MANIFEST.$(PACKAGE)" && \
          for i in $(PACKAGE_INFO); do \
Index: preview/Makefile.in
===================================================================
RCS file: /cvsroot/auctex/auctex/preview/Makefile.in,v
retrieving revision 1.77
diff -u -r1.77 Makefile.in
--- preview/Makefile.in 29 Jan 2006 21:41:42 -0000      1.77
+++ preview/Makefile.in 21 Mar 2006 19:23:24 -0000
@@ -65,10 +65,10 @@
 
 
 .PHONY: install install-texmf install-el install-images install-startup \
-       install-nosearch install-metadata use-hint all lisp texmf
+       install-nosearch use-hint all lisp texmf
 
 install: install-texmf install-el install-nosearch install-images \
-         install-startup install-metadata use-hint
+         install-startup use-hint
 
 use-hint:
        @echo "Installation completed."
@@ -94,18 +94,6 @@
        -$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)
        : >$(DESTDIR)$(packagedatadir)/.nosearch
 
-install-metadata:
-       test "x$(packagedir)" = xno || { \
-         $(MKINSTALLDIRS) $(DESTDIR)$(packagedir)/pkginfo || : ; \
-         $(ELCC) $(AUCTEX) -l preview -l prv-install -f preview-make-package 
$(DESTDIR)$(packagedir) "$(PACKAGE)" preview-release-date preview-version 
auto.el && \
-         cd $(DESTDIR)$(packagedir) && \
-         find "etc/$(PACKAGE)" "lisp/$(PACKAGE)" -print 
>"pkginfo/MANIFEST.$(PACKAGE)" && \
-         for i in $(PACKAGE_INFO); do \
-           test ! -r "info/$$i.info" || echo "info/$$i.info" >> 
"pkginfo/MANIFEST.$(PACKAGE)" ; \
-         done && \
-         echo "pkginfo/MANIFEST.$(PACKAGE)" >> "pkginfo/MANIFEST.$(PACKAGE)" ; 
\
-       }
-
 install-images: $(ICON_SOURCES)
        -$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/images
        for x in $(ICON_SOURCES); do \
Index: preview/prv-install.el
===================================================================
RCS file: /cvsroot/auctex/auctex/preview/prv-install.el,v
retrieving revision 1.12
diff -u -r1.12 prv-install.el
--- preview/prv-install.el      24 Jun 2005 08:14:05 -0000      1.12
+++ preview/prv-install.el      21 Mar 2006 19:23:24 -0000
@@ -51,7 +51,7 @@
         (package-name (pop command-line-args-left))
         (release-version (eval (read (pop command-line-args-left))))
         (author-version (eval (read (pop command-line-args-left))))
-        (append-file (pop command-line-args-left))
+        append-file
          (lisp-dir (expand-file-name (format "lisp/%s/" package-name)
                                     package-dir))
          (metadata (expand-file-name "_pkg.el" lisp-dir))
@@ -103,11 +103,12 @@
               (update-autoload-files (list lisp-dir) "auctex"))
              (t (error "Failed to generate autoloads.")))
       (fset 'message si:message))
-    (when (file-exists-p generated-autoload-file)
-      (with-temp-buffer (insert-file append-file)
-                       (append-to-file (point-min) (point-max)
-                                       generated-autoload-file))
-      (byte-compile-file generated-autoload-file))))
+    (while (setq append-file (pop command-line-args-left))
+      (when (file-exists-p generated-autoload-file)
+       (with-temp-buffer (insert-file append-file)
+                         (append-to-file (point-min) (point-max)
+                                         generated-autoload-file))))
+    (byte-compile-file generated-autoload-file)))
 
 
 ;;; prv-install.el ends here

-- 
Ralf