summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-07 14:41:51 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-07 14:41:51 -0800
commitb9a5f6811d186ec2420df39e3ec8087c7166a636 (patch)
tree668dd424d6e2d0c03986a2b5be26f210d96bc991 /Documentation/Makefile
parent8e12ab2f336aea36dc29f4129926a69e6ba67027 (diff)
parenta617578d373972842d41cc86625cf094c113d58b (diff)
downloadgit-b9a5f6811d186ec2420df39e3ec8087c7166a636.tar.gz
Merge branch 'jk/doc-makefile-cleanup'
* jk/doc-makefile-cleanup: Documentation/Makefile: clean up MAN*_TXT lists
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile39
1 files changed, 30 insertions, 9 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index af780049d2..ae27aa5cdd 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,13 +1,34 @@
-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))