1 files changed, 12 insertions, 11 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 51c06835396..18d7693da2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,16 +33,17 @@
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
-srcdir=@srcdir@
+srcdir = @srcdir@
-VPATH=@srcdir@
+abs_builddir = @abs_builddir@
-CC=@CC@
+VPATH = $(srcdir)
-CPP=@CPP@
+CC = @CC@
-CFLAGS=@CFLAGS@
+CPP = @CPP@
-CPPFLAGS=@CPPFLAGS@
+CFLAGS = @CFLAGS@
-LDFLAGS=@LDFLAGS@
+CPPFLAGS = @CPPFLAGS@
-LN_S=@LN_S@
+LDFLAGS = @LDFLAGS@
-EXEEXT=@EXEEXT@
+LN_S = @LN_S@
-version=@version@
+EXEEXT = @EXEEXT@
+version = @version@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 @SET_MAKE@
@@ -63,7 +64,7 @@ M_FILE = ${srcdir}/@machfile@
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)
-bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}
+bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}
 OTHER_FILES = @OTHER_FILES@

diff --git a/src/Makefile.in b/src/Makefile.in index 51c06835396..18d7693da2e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in
@@ -33,16 +33,17 @@
33		33
34	# Here are the things that we expect ../configure to edit.	34	# Here are the things that we expect ../configure to edit.
35	# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.	35	# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
36	srcdir=@srcdir@	36	srcdir = @srcdir@
37	VPATH=@srcdir@	37	abs_builddir = @abs_builddir@
38	CC=@CC@	38	VPATH = $(srcdir)
39	CPP=@CPP@	39	CC = @CC@
40	CFLAGS=@CFLAGS@	40	CPP = @CPP@
41	CPPFLAGS=@CPPFLAGS@	41	CFLAGS = @CFLAGS@
42	LDFLAGS=@LDFLAGS@	42	CPPFLAGS = @CPPFLAGS@
43	LN_S=@LN_S@	43	LDFLAGS = @LDFLAGS@
44	EXEEXT=@EXEEXT@	44	LN_S = @LN_S@
45	version=@version@	45	EXEEXT = @EXEEXT@
		46	version = @version@
46	# Substitute an assignment for the MAKE variable, because	47	# Substitute an assignment for the MAKE variable, because
47	# BSD doesn't have it as a default.	48	# BSD doesn't have it as a default.
48	@SET_MAKE@	49	@SET_MAKE@
@@ -63,7 +64,7 @@ M_FILE = ${srcdir}/@machfile@
63	S_FILE = ${srcdir}/@opsysfile@	64	S_FILE = ${srcdir}/@opsysfile@
64	config_h = config.h $(M_FILE) $(S_FILE)	65	config_h = config.h $(M_FILE) $(S_FILE)
65		66
66	bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}	67	bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}
67		68
68	OTHER_FILES = @OTHER_FILES@	69	OTHER_FILES = @OTHER_FILES@
69		70