--- a/src/Makefile.in +++ b/src/Makefile.in @@ -70,6 +70,8 @@ lispsource = $(top_srcdir)/lisp lib = ../lib hostlib = $(top_builddir)/lib libsrc = ../lib-src +MAKE_DOCFILE = $(libsrc)/make-docfile$(EXEEXT) +MAKE_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) etc = ../etc oldXMenudir = ../oldXMenu lwlibdir = ../lwlib @@ -518,7 +520,7 @@ ifeq ($(CHECK_STRUCTS),true) pdumper.o: dmpstruct.h endif dmpstruct.h: $(srcdir)/dmpstruct.awk -dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) +dmpstruct.h: $(MAKE_FINGERPRINT) $(dmpstruct_headers) $(AM_V_GEN)POSIXLY_CORRECT=1 $(AWK) -f $(srcdir)/dmpstruct.awk \ $(dmpstruct_headers) > $@ @@ -660,10 +662,10 @@ endif ## for the first time, this prevents any variation between configurations ## in the contents of the DOC file. ## -$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) +$(etc)/DOC: $(MAKE_DOCFILE) $(doc_obj) $(AM_V_GEN)$(MKDIR_P) $(etc) $(AM_V_at)rm -f $(etc)/DOC - $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ + $(AM_V_at)$(MAKE_DOCFILE) -d $(srcdir) \ $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC $(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ @@ -679,8 +681,8 @@ buildobj.h: Makefile GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) -gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) - $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp +gl-stamp: $(MAKE_DOCFILE) $(GLOBAL_SOURCES) + $(AM_V_GLOBALS)$(MAKE_DOCFILE) -d $(srcdir) -g $(doc_obj) > globals.tmp $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h $(AM_V_at)echo timestamp > $@ @@ -694,7 +696,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) $(MAKE) -C $(dir $@) all ifeq ($(HAVE_PDUMPER),yes) -MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) +MAKE_PDUMPER_FINGERPRINT = $(MAKE_FINGERPRINT) else MAKE_PDUMPER_FINGERPRINT = endif --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -24,7 +24,7 @@ SHELL = @SHELL@ unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH # Following ../lisp/Makefile.in. -EMACS = ../src/emacs${EXEEXT} +EMACS = $(or $(HOST_EMACS),../src/emacs${EXEEXT}) EMACSOPT = -batch --no-site-file --no-site-lisp # ==================== Things 'configure' will edit ==================== --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -53,7 +53,7 @@ FIND_DELETE = @FIND_DELETE@ # We never change directory before running Emacs, so a relative file # name is fine, and makes life easier. If we need to change # directory, we can use emacs --chdir. -EMACS = ../src/emacs${EXEEXT} +EMACS = $(or $(HOST_EMACS),../src/emacs${EXEEXT}) # Command line flags for Emacs.