Avoid user environment interfering with bootstrap

* Makefile.in, admin/unidata/Makefile.in:
* doc/misc/Makefile.in, lib-src/Makefile.in:
Don't export user environment variables that can affect running
emacs.  (Bug#53038)

diff --git a/Makefile.in b/Makefile.in
index b72127dde671278c69db0cc7ba1ca4ed95703af5..8ac6f5274699b9465dfe72e44c9b853ca25d83f2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -319,6 +319,9 @@ GLIB_COMPILE_SCHEMAS = glib-compile-schemas
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
+
 # What emacs should be called when installed.
 EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
 EMACS = ${EMACS_NAME}${EXEEXT}

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 45bba85213bbfa2e2168b1025e811bafe9ddf092..e75010dc2b870a030c37f6874c7a47743bd6d415 100644 (file)
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -29,6 +29,9 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
+
 EMACS = ${top_builddir}/src/emacs
 unidir = ${top_srcdir}/lisp/international
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 6c1e9cbc910f650aaa8d863bb277e646b8c630b0..d348dbc194bdf6a773eeeb97d2ae47a2a66e9d4a 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -234,6 +234,10 @@ ${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi
 
 
 abs_top_builddir = @abs_top_builddir@
+
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
+
 EMACS = ${abs_top_builddir}/src/emacs
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp --eval '(setq load-prefer-newer t)'
 

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index c25ba5c974dd5cb74ab58633ca46bea5e058f07e..0453b935068e9c0b582ecb2cd7e84535a8370995 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -20,6 +20,9 @@
 
 SHELL = @SHELL@
 
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
+
 # Following ../lisp/Makefile.in.
 EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp