Merge from gnulib.

[gnu-emacs] / nt / makefile.w32-in

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index e37a46032912a45781201087e806e3c9ec47d3f4..274ce7e527199c6696b203a394af9ad5204a2e20 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
 #        (and remove or replace this comment).
 
-VERSION                = 24.0.95
+VERSION                = 24.1.50
 
 TMP_DIST_DIR   = emacs-$(VERSION)
 
@@ -89,7 +89,9 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 #
 # Build emacs
 #
-all:   which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)
+all:   which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
+
+all-other-dirs-$(MAKETYPE): maybe-bootstrap
 
 all-other-dirs-nmake: addsection
        cd ..\lib
@@ -177,8 +179,10 @@ bootstrap-nmake: addsection cmdproxy
 bootstrap-gmake: addsection cmdproxy
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src make-docfile
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
        $(CP) $(BLD)/cmdproxy.exe ../bin
@@ -253,17 +257,19 @@ install-other-dirs-gmake: all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
-install-shortcuts: $(INSTALL_DIR)/bin
+install-addpm: $(INSTALL_DIR)/bin addpm
        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
+
+install-shortcuts: install-addpm
        "$(INSTALL_DIR)/bin/addpm" -q
 
 maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE)
 
 maybe-copy-distfiles-CMD: create-tmp-dist-dir doit
-       @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
+       @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin
 
 maybe-copy-distfiles-SH: create-tmp-dist-dir doit
-       @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \
+       @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" ] ; then \
          $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \
        fi
 
@@ -272,7 +278,7 @@ create-tmp-dist-dir:
 # Also create bin directory for dist files.
        mkdir "$(TMP_DIST_DIR)/bin"
 
-dist: install-bin maybe-copy-distfiles
+dist: install-bin install-addpm maybe-copy-distfiles
        $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR)
        $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR)
        $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR)
@@ -303,11 +309,11 @@ info-nmake:
        $(MAKE) $(MFLAGS) info
        cd $(MAKEDIR)
 
-info-gmake:
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info
+info-gmake: emacs misc lispref lispintro
+
+emacs misc lispref lispintro:
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/$@ info
+
 #
 # Maintenance
 #