--- Makefile.in	23 Jun 2005 22:18:30 +0200	1.111
+++ Makefile.in	14 Jul 2005 16:54:02 +0200	
@@ -14,6 +14,7 @@
 localstatedir = @address@hidden(null)
 infodir = @address@hidden(null)
 lispdir = @address@hidden(null)
+srcdir = @address@hidden(null)
 address@hidden@
 packagelispdir = @address@hidden(null)
 packagedatadir = @address@hidden(null)
@@ -25,6 +26,8 @@
 AUCTEXDATE = @AUCTEXDATE@
 AUCTEXVERSION = @AUCTEXVERSION@
 
+VPATH=$(srcdir)
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = ./mkinstalldirs
@@ -34,6 +37,7 @@
 PACKAGE_INFO=auctex preview-latex
 address@hidden@
 ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
+BYTESRC=-eval '(eval `(defun byte-compile-dest-file (file) (setq file (concat file "c"))(if (file-exists-p file) file (file-relative-name file ,(pop command-line-args-left)))))'
 AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
   (mapcar (function update-file-autoloads) command-line-args-left) \
   (save-buffers-kill-emacs t))'
@@ -111,8 +115,13 @@
 	clean distclean snapshot check-dist release-commit \
 	dist patch tar-ball full-release tar-ball-clean wc xemacs-package
 
-lisp:	tex-site.el $(AUCSRC)
-	$(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC)
+lisp:	tex-site.el $(AUCELC)
+
+# This also compiles tex-site.elc unnecessarily. so we remove it again.
+
+$(AUCELC): tex-site.el $(AUCSRC) $(STYLESRC)
+	$(ELCC) $(BYTESRC) -f batch-byte-compile $(srcdir) $?
+	-rm tex-site.elc
 
 info:
 	cd doc ; $(MAKE) info
@@ -144,11 +153,11 @@
 auto-loads.el: $(AUCSRC) $(COMPILE_MULE) Makefile
 	test X$(packagedir) != Xno || { \
 	  rm -f $@ ; \
-	  $(ELCC) $(AUTOLOAD) $(AUCSRC) $(COMPILE_MULE) || : ; \
+	  $(ELCC) $(AUTOLOAD) $(BYTESRC) $(AUCSRC) $(COMPILE_MULE) || : ; \
 	  test -r $@ || { \
 	    echo ";; Auto-generated part of tex-site.el" > $@ ; \
 	    echo "" >> $@ ; \
-	    $(ELCC) $(AUTOLOAD) $(AUCSRC) $(COMPILE_MULE) ; \
+	    $(ELCC) $(AUTOLOAD) $(BYTESRC) $(AUCSRC) $(COMPILE_MULE) ; \
 	  } ; \
 	}
 
@@ -160,14 +169,14 @@
 
 install-man:
 	cd doc && $(MAKE) 'DESTDIR=$(DESTDIR)' install-man
-	$(INSTALL_DATA) RELEASE $(DESTDIR)$(packagedir)/man/auctex
+	$(INSTALL_DATA) $(srcdir)/RELEASE $(DESTDIR)$(packagedir)/man/auctex
 
 install-startup:
 	test $(packagedir) != no || \
 	  $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
 
 contrib:
-	$(ELCC) -f batch-byte-compile $(CONTRIB) $(COMPILE_MULE)
+	$(ELCC) $(BYTESRC) -f batch-byte-compile $(CONTRIB) $(COMPILE_MULE)
 
 install-el:
 	-$(MKINSTALLDIRS) $(DESTDIR)$(lispdir)
@@ -186,14 +195,14 @@
 	fi
 	-$(MKINSTALLDIRS) $(DESTDIR)$(packagelispdir)
 	for x in $(AUCSRC) ; do \
-	  echo ' $(INSTALL_DATA)' $$x '$(DESTDIR)$(packagelispdir)' ; \
-	  $(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
+	  echo ' $(INSTALL_DATA)' $(srcdir)/$$x '$(DESTDIR)$(packagelispdir)' ; \
+	  $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(packagelispdir) ; \
 	done;
 	-$(MKINSTALLDIRS) $(DESTDIR)$(styledir)
 	$(INSTALL_DATA) $(NOSEARCH) $(DESTDIR)$(styledir)
 	for x in $(STYLESRC) ; do \
-	  echo ' $(INSTALL_DATA)' $$x '$(DESTDIR)$(styledir)' ; \
-	  $(INSTALL_DATA) $$x $(DESTDIR)$(styledir) ; \
+	  echo ' $(INSTALL_DATA)' $(srcdir)/$$x '$(DESTDIR)$(styledir)' ; \
+	  $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(styledir) ; \
 	done;
 	-$(MKINSTALLDIRS) $(DESTDIR)$(autodir)
 	-$(INSTALL_DATA) $(NOSEARCH) $(DESTDIR)$(autodir)
@@ -210,14 +219,14 @@
 
 install-images:
 	-$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/images
-	set -x; for x in images/*.xpm ; do \
+	set -x; for x in $(srcdir)/images/*.xpm ; do \
 	  $(INSTALL_DATA) $${x} $(DESTDIR)$(packagedatadir)/images ; \
 	done;
 
 install-contrib-el:
 	for x in $(CONTRIB) $(CONTRIB_MULE); do \
-	  echo ' $(INSTALL_DATA)' $$x '$(DESTDIR)$(packagelispdir)' ; \
-	  $(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
+	  echo ' $(INSTALL_DATA)' $(srcdir)/$$x '$(DESTDIR)$(packagelispdir)' ; \
+	  $(INSTALL_DATA) $(srcdir)$$x $(DESTDIR)$(packagelispdir) ; \
 	done;
 
 install-contrib:	install-contrib-el $(CONTRIBELC) $(CONTRIB_MULEELC)
@@ -237,7 +246,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 $(srcdir)/preview/prv-install -f preview-make-package $(DESTDIR)$(packagedir) "$(PACKAGE)" \"`echo $(AUCTEXDATE)|sed 's/\(.*\)-\(.*\)-\(.*\)/\1.\2\3/'`\" \"$(AUCTEXVERSION)\" tex-site.el && \
 	  cd $(DESTDIR)$(packagedir) && \
 	  find "etc/$(PACKAGE)" "lisp/$(PACKAGE)" -print >"pkginfo/MANIFEST.$(PACKAGE)" && \
 	  for i in $(PACKAGE_INFO); do \
@@ -246,9 +255,6 @@
 	  echo "pkginfo/MANIFEST.$(PACKAGE)" >> "pkginfo/MANIFEST.$(PACKAGE)" ; \
 	}
 
-.el.elc:
-	$(ELCC) -f batch-byte-compile $<
-
 clean:
 	rm -f $(CLEANFILES)
 	cd doc && $(MAKE) clean