From 1f05cd82d2e3c79ecede95aef578d1f395549b22 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 5 Nov 2011 16:55:08 -0600 Subject: [PATCH] * src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to support MSVC. --- src/ChangeLog | 5 +++++ src/makefile.w32-in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c14eb42983e..eaa94529bdf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-05 Christoph Scholtes + + * makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to + support MSVC. + 2011-11-05 Jason Rumney * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts. diff --git a/src/makefile.w32-in b/src/makefile.w32-in index bee857694e2..e97f7f3aca4 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -177,7 +177,7 @@ temacs: stamp_BLD $(TEMACS) $(TEMACS): $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \ ../nt/$(BLD)/addsection.exe $(GNULIB) $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) - "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21 + "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21 # These omit firstfile.${O}, but there's no documentation in there # anyways. @@ -232,7 +232,7 @@ globals.h: gl-stamp gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES) - $(DEL) gl-tmp - "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp + "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h" - $(DEL) gl-tmp echo timestamp > $@ -- 2.39.5