From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: "Martin Ågren" <martin.agren@gmail.com>, "brian m . carlson" <sandals@crustytoothpaste.net>, "Jeff King" <peff@peff.net>, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, "Felipe Contreras" <felipe.contreras@gmail.com> Subject: [PATCH 01/11] doc: allow the user to provide ASCIIDOC_EXTRA Date: Fri, 14 May 2021 07:14:25 -0500 [thread overview] Message-ID: <20210514121435.504423-2-felipe.contreras@gmail.com> (raw) In-Reply-To: <20210514121435.504423-1-felipe.contreras@gmail.com> Without `override` all additions will be ignored by make. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- Documentation/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index f5605b7767..981e322f18 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -191,9 +191,9 @@ ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 ASCIIDOC_DOCBOOK = docbook5 -ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 -ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions -ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +override ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 +override ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions +override ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation @@ -206,12 +206,12 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) ifdef DEFAULT_PAGER DEFAULT_PAGER_SQ = $(subst ','\'',$(DEFAULT_PAGER)) -ASCIIDOC_EXTRA += -a 'git-default-pager=$(DEFAULT_PAGER_SQ)' +override ASCIIDOC_EXTRA += -a 'git-default-pager=$(DEFAULT_PAGER_SQ)' endif ifdef DEFAULT_EDITOR DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR)) -ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' +override ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' endif QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir @@ -375,7 +375,7 @@ technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh -technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ +technical/%.html: override ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \ asciidoc.conf GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt @@ -425,7 +425,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt WEBDOC_DEST = /pub/software/scm/git/docs -howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ +howto/%.html: override ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC) \ sed -e '1,/^$$/d' $< | \ -- 2.31.1
next prev parent reply other threads:[~2021-05-14 12:14 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-14 12:14 [PATCH 00/11] doc: asciidoctor: direct man page creation and fixes Felipe Contreras 2021-05-14 12:14 ` Felipe Contreras [this message] 2021-05-15 9:32 ` [PATCH 01/11] doc: allow the user to provide ASCIIDOC_EXTRA Jeff King 2021-05-15 9:39 ` Jeff King 2021-05-15 12:13 ` Felipe Contreras 2021-05-17 8:57 ` Jeff King 2021-05-17 10:53 ` Felipe Contreras 2021-05-17 11:39 ` Jeff King 2021-05-17 16:50 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 02/11] doc: doc-diff: allow more than one flag Felipe Contreras 2021-05-15 9:37 ` Jeff King 2021-05-15 12:11 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 03/11] doc: doc-diff: set docdate manually Felipe Contreras 2021-05-14 15:43 ` Martin Ågren 2021-05-14 20:33 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 04/11] doc: use asciidoctor to build man pages directly Felipe Contreras 2021-05-14 15:38 ` Martin Ågren 2021-05-14 20:26 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 05/11] doc: asciidoctor: add linkgit macros in man pages Felipe Contreras 2021-05-14 12:14 ` [PATCH 06/11] doc: join mansource and manversion Felipe Contreras 2021-05-14 12:14 ` [PATCH 07/11] doc: add man pages workaround for asciidoctor Felipe Contreras 2021-05-14 12:14 ` [PATCH 08/11] doc: asciidoctor: add hack for xrefs Felipe Contreras 2021-05-14 12:14 ` [PATCH 09/11] doc: asciidoctor: add hack to improve links Felipe Contreras 2021-05-14 12:14 ` [PATCH 10/11] doc: asciidoctor: add support for baseurl Felipe Contreras 2021-05-14 12:14 ` [PATCH 11/11] doc: asciidoctor: cleanup man page hack Felipe Contreras
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210514121435.504423-2-felipe.contreras@gmail.com \ --to=felipe.contreras@gmail.com \ --cc=avarab@gmail.com \ --cc=git@vger.kernel.org \ --cc=martin.agren@gmail.com \ --cc=peff@peff.net \ --cc=sandals@crustytoothpaste.net \ --subject='Re: [PATCH 01/11] doc: allow the user to provide ASCIIDOC_EXTRA' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).