From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6511620491 for ; Sun, 21 Aug 2016 11:47:11 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/4] doc: avoid conflicting with MakeMaker variable names Date: Sun, 21 Aug 2016 11:47:08 +0000 Message-Id: <20160821114708.27408-5-e@80x24.org> In-Reply-To: <20160821114708.27408-1-e@80x24.org> References: <20160821114708.27408-1-e@80x24.org> List-Id: We want the pod2man(1) executable for handling certain options. Also, use the correct year while we're at it :P --- Documentation/include.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/include.mk b/Documentation/include.mk index bd9df8c..5d73028 100644 --- a/Documentation/include.mk +++ b/Documentation/include.mk @@ -7,12 +7,12 @@ RSYNC_DEST = public-inbox.org:/srv/public-inbox/ docs := README COPYING INSTALL TODO HACKING docs += $(shell git ls-files 'Documentation/*.txt') INSTALL = install -POD2MAN ?= pod2man -POD2MAN_OPTS = -v --stderr -d 1994-10-02 -c 'public-inbox user manual' -pod2man = $(POD2MAN) $(POD2MAN_OPTS) -POD2TEXT = pod2text -POD2TEXT_OPTS = --stderr -pod2text = $(POD2TEXT) $(POD2TEXT_OPTS) +PODMAN = pod2man +PODMAN_OPTS = -v --stderr -d 1993-10-02 -c 'public-inbox user manual' +podman = $(PODMAN) $(PODMAN_OPTS) +PODTEXT = pod2text +PODTEXT_OPTS = --stderr +podtext = $(PODTEXT) $(PODTEXT_OPTS) m1 = m1 += public-inbox-mda @@ -42,7 +42,7 @@ install-man: man test -z "$(man7)" || $(INSTALL) -m 644 $(man7) $(DESTDIR)$(man7dir) %.1 : Documentation/%.pod - $(pod2man) -s 1 $< $@+ && mv $@+ $@ + $(podman) -s 1 $< $@+ && mv $@+ $@ mantxt = $(addprefix Documentation/, $(addsuffix .txt, $(m1))) docs += $(mantxt) @@ -50,7 +50,7 @@ docs += $(mantxt) all :: $(mantxt) Documentation/%.txt : Documentation/%.pod - $(pod2text) $< $@+ && mv $@+ $@ + $(podtext) $< $@+ && mv $@+ $@ txt2pre = ./Documentation/txt2pre <$< >$@+ && touch -r $< $@+ && mv $@+ $@ txt := INSTALL README COPYING TODO -- EW