Merge branch 'jk/doc-makefile-cleanup'

* jk/doc-makefile-cleanup:
Documentation/Makefile: clean up MAN*_TXT lists

diff --combined Documentation/Makefile
index af780049d2544f4ab22bcfe3f0474fcfcec55d29,5d22e0e0235a03e78681f0fd365f39a596d076b2..ae27aa5cdd439269924d693c4cf0cb5ea49e25d2
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -1,20 -1,39 +1,41 @@@
- MAN1_TXT= \
-       $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
-               $(wildcard git-*.txt)) \
-       gitk.txt gitweb.txt git.txt gitremote-helpers.txt
- MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \
-       gitrepository-layout.txt gitweb.conf.txt
- MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \
-       gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \
-       gitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt
+ # Guard against environment variables
+ MAN1_TXT =
+ MAN5_TXT =
+ MAN7_TXT =
+ 
+ MAN1_TXT += $(filter-out \
+               $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
+               $(wildcard git-*.txt))
+ MAN1_TXT += git.txt
+ MAN1_TXT += gitk.txt
++MAN1_TXT += gitremote-helpers.txt
+ MAN1_TXT += gitweb.txt
+ 
+ MAN5_TXT += gitattributes.txt
+ MAN5_TXT += githooks.txt
+ MAN5_TXT += gitignore.txt
+ MAN5_TXT += gitmodules.txt
+ MAN5_TXT += gitrepository-layout.txt
+ MAN5_TXT += gitweb.conf.txt
+ 
+ MAN7_TXT += gitcli.txt
+ MAN7_TXT += gitcore-tutorial.txt
  MAN7_TXT += gitcredentials.txt
+ MAN7_TXT += gitcvs-migration.txt
+ MAN7_TXT += gitdiffcore.txt
+ MAN7_TXT += gitglossary.txt
+ MAN7_TXT += gitnamespaces.txt
+ MAN7_TXT += gitrevisions.txt
+ MAN7_TXT += gittutorial-2.txt
+ MAN7_TXT += gittutorial.txt
+ MAN7_TXT += gitworkflows.txt
  
  MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
  MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
  MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
  
 -DOC_HTML=$(MAN_HTML)
 +OBSOLETE_HTML = git-remote-helpers.html
 +DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML)
  
  ARTICLES = howto-index
  ARTICLES += everyday
@@@ -262,12 -281,6 +283,12 @@@ $(MAN_HTML): %.html : %.txt asciidoc.co
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
        mv $@+ $@
  
 +$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
 +      $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 +      $(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
 +              $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
 +      mv $@+ $@
 +
  manpage-base-url.xsl: manpage-base-url.xsl.in
        sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
  
@@@ -353,8 -366,8 +374,8 @@@ $(patsubst %.txt,%.html,$(wildcard howt
  install-webdoc : html
        '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
  
 -# You must have a clone of git-htmldocs and git-manpages repositories
 -# next to the git repository itself for the following to work.
 +# You must have a clone of 'git-htmldocs' and 'git-manpages' repositories
 +# next to the 'git' repository itself for the following to work.
  
  quick-install: quick-install-man