Standardize indentation somewhat.

(bootstrap-temacs): Use $(ARGQUOTE) instead of literal quotes, to
cater for differences between shells.

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 39621a1ace316b5b6c6ad7478173e5755057ca3b..e6b9eed4144239948fb8f1aa09170cb904c26eb8 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -148,7 +148,7 @@ all:            $(ALL)
 #\r
 emacs:          $(BLD) $(EMACS)\r
 $(EMACS):       $(DOC) $(TEMACS)\r
-               "./$(BLD)/temacs.exe" -batch -l loadup dump\r
+       "./$(BLD)/temacs.exe" -batch -l loadup dump\r
 \r
 #\r
 # The undumped executable\r
@@ -158,8 +158,8 @@ $(EMACS):       $(DOC) $(TEMACS)
 #\r
 temacs:         $(BLD) $(TEMACS)\r
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)\r
-               $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)\r
-               "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16\r
+       $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)\r
+       "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16\r
 \r
 bootstrap: bootstrap-emacs\r
 \r
@@ -168,47 +168,47 @@ bootstrap: bootstrap-emacs
 # Lisp files from loadup.el in source form.\r
 #\r
 bootstrap-temacs: bootstrap-clean\r
-               $(MAKECMD) temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000"\r
+       $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)\r
 \r
 #\r
 # Dump an Emacs executable named bootstrap-emacs containing the \r
 # files from loadup.el in source form.\r
 #\r
 bootstrap-emacs: bootstrap-temacs\r
-               "./$(BLD)/temacs.exe" -batch -l loadup bootstrap\r
-               - mkdir "../bin"\r
-               $(CP) $(EMACS) ../bin\r
+       "./$(BLD)/temacs.exe" -batch -l loadup bootstrap\r
+       - mkdir "../bin"\r
+       $(CP) $(EMACS) ../bin\r
 \r
 #\r
 # Force recompile of files that depend on PURESIZE\r
 #\r
 bootstrap-clean:\r
-               - $(DEL) $(BLD)/alloc.$(O)\r
-               - $(DEL) $(BLD)/data.$(O)\r
-               - $(DEL) $(BLD)/intervals.$(O)\r
-               - $(DEL) $(BLD)/keyboard.$(O)\r
-               - $(DEL) $(BLD)/keymap.$(O)\r
+       - $(DEL) $(BLD)/alloc.$(O)\r
+       - $(DEL) $(BLD)/data.$(O)\r
+       - $(DEL) $(BLD)/intervals.$(O)\r
+       - $(DEL) $(BLD)/keyboard.$(O)\r
+       - $(DEL) $(BLD)/keymap.$(O)\r
 \r
 #\r
 # The resource file.  NT 3.10 requires the use of cvtres; even though\r
 # it is not necessary on later versions, it is still ok to use it.\r
 #\r
-$(TRES):       ../nt/emacs.rc\r
-               $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)\r
+$(TRES): ../nt/emacs.rc\r
+       $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)\r
 \r
 #\r
 # Build the library.  Split up the build into two phases...otherwise we \r
 # run out of command line space.\r
 #\r
 $(TLIB0):       $(OBJ0)\r
-               - $(DEL) $@\r
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
+       - $(DEL) $@\r
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
 $(TLIB1):       $(OBJ1)\r
-               - $(DEL) $@\r
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
+       - $(DEL) $@\r
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
 $(TLIBW32):    $(WIN32OBJ)\r
-               - $(DEL) $@\r
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
+       - $(DEL) $@\r
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
 \r
 #\r
 # Place lastfile.$(O) in its own library so that it can be loaded after\r
@@ -216,31 +216,32 @@ $(TLIBW32):       $(WIN32OBJ)
 # the end of Emacs' data section portably across compilers and systems.\r
 #\r
 $(TLASTLIB):   $(BLD)/lastfile.$(O)\r
-               - $(DEL) $@\r
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
+       - $(DEL) $@\r
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)\r
 \r
 #\r
 # Assuming INSTALL_DIR is defined, build and install emacs in it.\r
 #\r
 install:        $(ALL)\r
-               - mkdir "$(INSTALL_DIR)/bin"\r
-               $(CP) $(EMACS) $(INSTALL_DIR)/bin\r
+       - mkdir "$(INSTALL_DIR)/bin"\r
+       $(CP) $(EMACS) $(INSTALL_DIR)/bin\r
 \r
 #\r
 # Maintenance\r
 # \r
-clean:;         - $(DEL) *~ "s/*~" "m/*~"\r
-               - $(DEL) *.pdb\r
-               - $(DEL_TREE) $(OBJDIR)\r
+clean:\r
+       - $(DEL) *~ "s/*~" "m/*~"\r
+       - $(DEL) *.pdb\r
+       - $(DEL_TREE) $(OBJDIR)\r
 \r
 distclean:     clean\r
-               - $(DEL) config.h epaths.h\r
+       - $(DEL) config.h epaths.h\r
 \r
 cleanall:      clean\r
-               - $(DEL_TREE) obj\r
-               - $(DEL_TREE) obj-spd\r
-               - $(DEL_TREE) oo\r
-               - $(DEL_TREE) oo-spd\r
+       - $(DEL_TREE) obj\r
+       - $(DEL_TREE) obj-spd\r
+       - $(DEL_TREE) oo\r
+       - $(DEL_TREE) oo-spd\r
 \r
 ### DEPENDENCIES ###\r
 \r