[Emacs-diffs] Changes to emacs/nt/makefile.w32-in [emacs-unicode-2]

[Miles Bader]

Index: emacs/nt/makefile.w32-in
diff -c emacs/nt/makefile.w32-in:1.16.4.1 emacs/nt/makefile.w32-in:1.16.4.2
*** emacs/nt/makefile.w32-in:1.16.4.1   Fri Apr 16 12:50:42 2004
--- emacs/nt/makefile.w32-in    Mon Jun 28 07:29:03 2004
***************
*** 1,5 ****
! #  Makefile for GNU Emacs on the Microsoft W32 API.
! #  Copyright (c) 2000-2001 Free Software Foundation, Inc.
  #
  #  Top level makefile for building GNU Emacs on Windows NT
  #
--- 1,5 ----
! #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
! #  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
  #
  #  Top level makefile for building GNU Emacs on Windows NT
  #
***************
*** 139,145 ****
        $(MAKE) $(MFLAGS) bootstrap
        $(MAKE) $(MFLAGS) bootstrap-clean
        cd ..\lisp
!       $(MAKE) $(MFLAGS) bootstrap
        cd ..\lib-src
        $(MAKE) $(MFLAGS) DOC
        cd ..\nt
--- 139,145 ----
        $(MAKE) $(MFLAGS) bootstrap
        $(MAKE) $(MFLAGS) bootstrap-clean
        cd ..\lisp
!       $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
        cd ..\lib-src
        $(MAKE) $(MFLAGS) DOC
        cd ..\nt
***************
*** 217,227 ****
  # Note that man/makefile knows how to
  # put the info files in $(infodir),
  # so we can do ok running make in the build dir.
! info: force-info
!       (cd ..\man && $(MAKE) $(MFLAGS) info)
!       (cd ..\lispref && $(MAKE) $(MFLAGS) info)
!       (cd ..\lispintro && $(MAKE) $(MFLAGS) info)
  
  #
  # Maintenance
  #
--- 217,236 ----
  # Note that man/makefile knows how to
  # put the info files in $(infodir),
  # so we can do ok running make in the build dir.
! info: force-info info-$(MAKETYPE)
! 
! info-nmake:
!       cd ..\man
!       $(MAKE) $(MFLAGS) info
!       cd ..\lispref
!       $(MAKE) $(MFLAGS) info
!       cd ..\lispintro
!       $(MAKE) $(MFLAGS) info
  
+ info-gmake:
+       $(MAKE) $(MFLAGS) -C ../man info
+       $(MAKE) $(MFLAGS) -C ../lispref info
+       $(MAKE) $(MFLAGS) -C ../lispintro info
  #
  # Maintenance
  #
***************
*** 272,276 ****
  
  realclean: cleanall
        - $(DEL_TREE) ../bin
- 
- # arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219
--- 281,283 ----