diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-03-21 12:57:49 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-03-21 12:57:49 +0100 |
| commit | 82c3d67afb365ecba2c3823beecc25606a8e9d70 (patch) | |
| tree | 10350f129b077caf0dd1170b446fc43e488f4fd6 /src | |
| parent | c0282183ba4a5b62292627a51726426479bf4272 (diff) | |
| download | emacs-82c3d67afb365ecba2c3823beecc25606a8e9d70.tar.gz | |
Use absolute directory names substituted by configure
* lisp/Makefile.in (top_srcdir): Define.
(abs_top_builddir): Define.
(srcdir): Don't append `/..'.
(EMACS): Use ${abs_top_builddir}.
(all, compile, compile-always, compile-last): Don't set emacswd.
(update-subdirs, update-authors): Use $(top_srcdir) instead of
$(srcdir).
(lisp): Use $(srcdir) instead of @srcdir@.
* src/Makefile.in (abs_builddir): Define.
(bootstrap_exe): Use it.
(VPATH): Use $(srcdir) instead of @srcdir@.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 33 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 80e10e2434f..39f37d4517c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,8 @@ 2010-03-21 Andreas Schwab <schwab@linux-m68k.org> - * Makefile.in (.el.elc): Expand ${bootstrap_exe} before chdir. - (${lispsource}loaddefs.el): Likewise. - (bootstrap-emacs${EXEEXT}): Likewise. + * Makefile.in (abs_builddir): Define. + (bootstrap_exe): Use it. + (VPATH): Use $(srcdir) instead of @srcdir@. 2010-03-20 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/src/Makefile.in b/src/Makefile.in index 6b502f39207..d8661bc0be6 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@ -VPATH=@srcdir@ -CC=@CC@ -CPP=@CPP@ -CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -LDFLAGS=@LDFLAGS@ -LN_S=@LN_S@ -EXEEXT=@EXEEXT@ -version=@version@ +srcdir = @srcdir@ +abs_builddir = @abs_builddir@ +VPATH = $(srcdir) +CC = @CC@ +CPP = @CPP@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LN_S = @LN_S@ +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 = `pwd`/bootstrap-emacs${EXEEXT} +bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT} OTHER_FILES = @OTHER_FILES@ @@ -1332,15 +1333,14 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS separately below. With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" */ .el.elc: - @EMACS=${bootstrap_exe}; \ - cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile THEFILE=$< EMACS=$$EMACS + @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ + THEFILE=$< EMACS=${bootstrap_exe} /* Since the .el.elc rule cannot specify an extra dependency, we do it here. */ ${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS) ${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) - EMACS=${bootstrap_exe}; \ - cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$$EMACS + cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe} /* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ @@ -1354,8 +1354,7 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ @: Compile some files earlier to speed up further compilation. - EMACS=${bootstrap_exe}; \ - cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=$$EMACS + cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe} #ifdef AUTO_DEPEND ALLOBJS=$(STARTFILES) ${obj} ${otherobj} prefix-args.o |