diff -r 7511cd0ecc25 XEmacs.rules
--- a/XEmacs.rules	Tue Jun 21 14:06:44 2016 +0200
+++ b/XEmacs.rules	Fri Oct 21 07:55:14 2016 +0900
@@ -284,7 +284,7 @@
 INFO_ENCODING = iso-2022-7
 endif
 
-FORMAT_INFO_USING_XEMACS_ARGS = -l informat -l texinfmt -f texinfo-format-buffer
+FORMAT_INFO_USING_XEMACS_ARGS += -l informat -l texinfmt -f texinfo-format-buffer
 
 FORMAT_INFO_USING_XEMACS = \
 	$(XEMACS_BATCH_PREPARE_FOR_TEXINFO) -insert $< \
diff -r 66f6114cc00e xemacs-packages/auctex/Makefile
--- a/xemacs-packages/auctex/Makefile	Mon Dec 15 09:53:11 2014 +0100
+++ b/xemacs-packages/auctex/Makefile	Fri Oct 21 07:55:14 2016 +0900
@@ -145,7 +145,7 @@
 
 %.dvi: %.tex
 ifneq ($(TEX),)
-	cd $(@D) && $(TEX) $(*F)
+	cd $(@D) && $(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) $(*F)
 else
 	-
 endif
@@ -214,10 +214,10 @@
 
 ## 70+ pages
 doc/auctex.dvi: doc/auctex.texi
-	cd $(@D) && $(TEX) "\nonstopmode\input auctex.texi" \
+	cd $(@D) && $(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) "\nonstopmode\input auctex.texi" \
 	&& texindex auctex.ky && texindex auctex.fn \
 	&& texindex auctex.vr && texindex auctex.cp \
-	&& $(TEX) "\nonstopmode\input auctex.texi"
+	&& $(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) "\nonstopmode\input auctex.texi"
 
 INSTALLATION: doc/install.texi
 	-$(RUN_MAKEINFO_INDIVIDUAL)
@@ -234,23 +234,23 @@
 
 $(PL)/preview-mk.ins: $(PL)/preview.dtx $(PL)/bootstrap.ins
 	cd $(PL) && \
-	$(TEX) '\nonstopmode \input bootstrap.ins'
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) '\nonstopmode \input bootstrap.ins'
 
 $(PL)/preview.ins: $(PL)/preview.dtx
 	cd $(PL) && \
-	$(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \
 	'\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \
 	'\endbatchfile'
 
 $(PREVIEW_TEXMFGEN) $(PL)/preview.drv: $(PL)/preview.dtx $(PL)/preview-mk.ins
 	cd $(PL) && \
-	$(TEX) '\nonstopmode \input preview-mk.ins'
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(TEX) '\nonstopmode \input preview-mk.ins'
 
 $(PL)/preview.dvi: $(PL)/preview.drv $(PL)/preview.dtx $(PL)/preview.sty
 	cd $(PL) && \
-	$(LATEX) '\nonstopmode \input preview.drv' && \
-	$(LATEX) '\nonstopmode \input preview.drv' && \
-	$(LATEX) '\nonstopmode \input preview.drv'
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(LATEX) '\nonstopmode \input preview.drv' && \
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(LATEX) '\nonstopmode \input preview.drv' && \
+	$(ENV) TEXINPUTS=$(TEXINPUTS) $(LATEX) '\nonstopmode \input preview.drv'
 
 clean::
 	@rm -f etc/*.elc
diff -r 35691a6a0d47 xemacs-packages/tramp/Makefile
--- a/xemacs-packages/tramp/Makefile	Mon Jan 04 21:10:51 2016 +0100
+++ b/xemacs-packages/tramp/Makefile	Fri Oct 21 07:55:15 2016 +0900
@@ -43,7 +43,7 @@
 include ../../XEmacs.rules
 
 lisp/tramp-loaddefs.el: $(LISPFILES)
-	make EMACS_GVFS=no EMACS_GW=no EMACS_INFO=xemacs \
+	${MAKE} EMACS_GVFS=no EMACS_GW=no EMACS_INFO=xemacs \
 		EMACS=$(XEMACS_BINARY) \
 		builddir=$(XEMACS_PACKAGES_BASE)/xemacs-packages/tramp/lisp \
 		-C lisp autoloads