Skip to content

Commit 824c621

Browse files
avargitster
authored andcommitted
Documentation/Makefile: make $(wildcard howto/*.txt) a var
Refactor occurrences of $(wildcard howto/*.txt) into a single HOWTO_TXT variable for readability and consistency. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 89b43f8 commit 824c621

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
MAN1_TXT =
33
MAN5_TXT =
44
MAN7_TXT =
5+
HOWTO_TXT =
56
TECH_DOCS =
67
ARTICLES =
78
SP_ARTICLES =
@@ -42,6 +43,8 @@ MAN7_TXT += gittutorial-2.txt
4243
MAN7_TXT += gittutorial.txt
4344
MAN7_TXT += gitworkflows.txt
4445

46+
HOWTO_TXT += $(wildcard howto/*.txt)
47+
4548
ifdef MAN_FILTER
4649
MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
4750
else
@@ -428,9 +431,9 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
428431
$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
429432
mv $@+ $@
430433

431-
howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
434+
howto-index.txt: howto-index.sh $(HOWTO_TXT)
432435
$(QUIET_GEN)$(RM) $@+ $@ && \
433-
'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
436+
'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \
434437
mv $@+ $@
435438

436439
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
@@ -439,7 +442,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
439442
WEBDOC_DEST = /pub/software/scm/git/docs
440443

441444
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
442-
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
445+
$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
443446
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
444447
sed -e '1,/^$$/d' $< | \
445448
$(TXT_TO_HTML) - >$@+ && \

0 commit comments

Comments
 (0)