* [Suggestion] Documentation: quick-install-man not propagating DESTDIR
@ 2020-09-01 22:28 Randall S. Becker
2020-09-02 19:44 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Randall S. Becker @ 2020-09-01 22:28 UTC (permalink / raw)
To: 'git'
The make quick-install-man rule is not propagating DESTDIR when GNU Make
4.2.1 is used.
It seems like a bit of a nit to report this, but I discovered that the
installation is not putting the manuals in the same place as git. It’s a
pretty simple fix. I can put a patch together if desired.
diff --git a/Makefile b/Makefile
index 372139f1f2..dae2d99a7f 100644
--- a/Makefile
+++ b/Makefile
@@ -2992,10 +2992,10 @@ install-gitweb:
$(MAKE) -C gitweb install
install-doc: install-man-perl
- $(MAKE) -C Documentation install
+ $(MAKE) -C Documentation install DESTDIR=$(DESTDIR)
install-man: install-man-perl
- $(MAKE) -C Documentation install-man
+ $(MAKE) -C Documentation install-man DESTDIR=$(DESTDIR)
install-man-perl: man-perl
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
@@ -3006,19 +3006,19 @@ install-html:
$(MAKE) -C Documentation install-html
install-info:
- $(MAKE) -C Documentation install-info
+ $(MAKE) -C Documentation install-info DESTDIR=$(DESTDIR)
install-pdf:
- $(MAKE) -C Documentation install-pdf
+ $(MAKE) -C Documentation install-pdf DESTDIR=$(DESTDIR)
quick-install-doc:
- $(MAKE) -C Documentation quick-install
+ $(MAKE) -C Documentation quick-install DESTDIR=$(DESTDIR)
quick-install-man:
- $(MAKE) -C Documentation quick-install-man
+ $(MAKE) -C Documentation quick-install-man DESTDIR=$(DESTDIR)
quick-install-html:
- $(MAKE) -C Documentation quick-install-html
+ $(MAKE) -C Documentation quick-install-html DESTDIR=$(DESTDIR)
-- Brief whoami:
NonStop developer since approximately 211288444200000000
UNIX developer since approximately 421664400
-- In my real life, I talk too much.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Suggestion] Documentation: quick-install-man not propagating DESTDIR
2020-09-01 22:28 [Suggestion] Documentation: quick-install-man not propagating DESTDIR Randall S. Becker
@ 2020-09-02 19:44 ` Junio C Hamano
2020-09-02 19:52 ` Randall S. Becker
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2020-09-02 19:44 UTC (permalink / raw)
To: Randall S. Becker; +Cc: 'git'
"Randall S. Becker" <rsbecker@nexbridge.com> writes:
> The make quick-install-man rule is not propagating DESTDIR when GNU Make
> 4.2.1 is used.
I wonder, instead of having to change all "$(MAKE) -C elsewhere", we
can add DESTDIR to the list of variables that are exported.
... goes and looks ...
Hmph, DESTDIR is exported together with DIFF, TAR, INSTALL and
SHELL_PATH. We do rely on SHELL_PATH to be exported correctly to
t/Makefile for "make test" to work, so it is puzzling.
It is doubly puzzling that we use $(INSTALL) in Documentation/Makefile
on the same line as $(DESTDIR) is used, and apparently you are not
reporting problem on that one.
> It seems like a bit of a nit to report this, but I discovered that the
> installation is not putting the manuals in the same place as git. It’s a
> pretty simple fix. I can put a patch together if desired.
I do not think we want that patch. Instead I think we'd want a
patch that uses the same trick as what makes INSTALL work.
Thanks.
> diff --git a/Makefile b/Makefile
> index 372139f1f2..dae2d99a7f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2992,10 +2992,10 @@ install-gitweb:
> $(MAKE) -C gitweb install
>
> install-doc: install-man-perl
> - $(MAKE) -C Documentation install
> + $(MAKE) -C Documentation install DESTDIR=$(DESTDIR)
>
> install-man: install-man-perl
> - $(MAKE) -C Documentation install-man
> + $(MAKE) -C Documentation install-man DESTDIR=$(DESTDIR)
>
> install-man-perl: man-perl
> $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
> @@ -3006,19 +3006,19 @@ install-html:
> $(MAKE) -C Documentation install-html
>
> install-info:
> - $(MAKE) -C Documentation install-info
> + $(MAKE) -C Documentation install-info DESTDIR=$(DESTDIR)
>
> install-pdf:
> - $(MAKE) -C Documentation install-pdf
> + $(MAKE) -C Documentation install-pdf DESTDIR=$(DESTDIR)
>
> quick-install-doc:
> - $(MAKE) -C Documentation quick-install
> + $(MAKE) -C Documentation quick-install DESTDIR=$(DESTDIR)
>
> quick-install-man:
> - $(MAKE) -C Documentation quick-install-man
> + $(MAKE) -C Documentation quick-install-man DESTDIR=$(DESTDIR)
>
> quick-install-html:
> - $(MAKE) -C Documentation quick-install-html
> + $(MAKE) -C Documentation quick-install-html DESTDIR=$(DESTDIR)
>
> -- Brief whoami:
> NonStop developer since approximately 211288444200000000
> UNIX developer since approximately 421664400
> -- In my real life, I talk too much.
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [Suggestion] Documentation: quick-install-man not propagating DESTDIR
2020-09-02 19:44 ` Junio C Hamano
@ 2020-09-02 19:52 ` Randall S. Becker
0 siblings, 0 replies; 3+ messages in thread
From: Randall S. Becker @ 2020-09-02 19:52 UTC (permalink / raw)
To: 'Junio C Hamano'; +Cc: 'git'
On September 2, 2020 3:45 PM, Junio C Hamano wrote:
> "Randall S. Becker" <rsbecker@nexbridge.com> writes:
>
> > The make quick-install-man rule is not propagating DESTDIR when GNU
> > Make
> > 4.2.1 is used.
>
> I wonder, instead of having to change all "$(MAKE) -C elsewhere", we can
> add DESTDIR to the list of variables that are exported.
>
> ... goes and looks ...
>
> Hmph, DESTDIR is exported together with DIFF, TAR, INSTALL and
> SHELL_PATH. We do rely on SHELL_PATH to be exported correctly to
> t/Makefile for "make test" to work, so it is puzzling.
>
> It is doubly puzzling that we use $(INSTALL) in Documentation/Makefile on
> the same line as $(DESTDIR) is used, and apparently you are not reporting
> problem on that one.
>
> > It seems like a bit of a nit to report this, but I discovered that the
> > installation is not putting the manuals in the same place as git. It’s
> > a pretty simple fix. I can put a patch together if desired.
>
> I do not think we want that patch. Instead I think we'd want a patch that
> uses the same trick as what makes INSTALL work.
I'll look into that approach. Thanks for the direction.
Regards,
Randall
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-02 19:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 22:28 [Suggestion] Documentation: quick-install-man not propagating DESTDIR Randall S. Becker
2020-09-02 19:44 ` Junio C Hamano
2020-09-02 19:52 ` Randall S. Becker
Code repositories for project(s) associated with this public 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).