[Emacs-diffs] /srv/bzr/emacs/trunk r106302: * src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to

[Christoph Scholtes]

------------------------------------------------------------
revno: 106302
committer: Christoph Scholtes <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-05 16:55:08 -0600
message:
  * src/makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
    support MSVC.
modified:
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-05 18:50:59 +0000
+++ b/src/ChangeLog     2011-11-05 22:55:08 +0000
@@ -1,3 +1,8 @@
+2011-11-05  Christoph Scholtes  <address@hidden>
+
+       * makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to
+       support MSVC.
+
 2011-11-05  Jason Rumney  <address@hidden>
 
        * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2011-11-05 11:34:56 +0000
+++ b/src/makefile.w32-in       2011-11-05 22:55:08 +0000
@@ -177,7 +177,7 @@
 $(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 @@
 
 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 > $@