* src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to

  support MSVC.

diff --git a/src/ChangeLog b/src/ChangeLog
index c14eb42983eff23613067b73c0445cc231008f6e..eaa94529bdf226da14f353f5e1b7d47c4c04a78d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-05  Christoph Scholtes  <cschol2112@googlemail.com>
+
+       * makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
+       support MSVC.
+
 2011-11-05  Jason Rumney  <jasonr@gnu.org>
 
        * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts.

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index bee857694e2471644a229619e201e55730fdc01d..e97f7f3aca46bdefa17fb501aca5aa53f899233d 100644 (file)
--- 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 > $@