1 |
>>>>> On Tue, 3 Nov 2015, Ulrich Mueller wrote: |
2 |
|
3 |
>>>>> On Tue, 3 Nov 2015, David Leverton wrote: |
4 |
>>> +\STATE call \t{docinto .} \COMMENT{sets the directory to \t{/usr/share/doc/\$\{PF\}}} |
5 |
|
6 |
>> Am I right in thinking that this creates /usr/share/doc/${PF} even |
7 |
>> if there end up being no docs to install? |
8 |
|
9 |
> Indeed. Thanks for catching this. |
10 |
|
11 |
I believe that the patch included below fixes this. Please review. |
12 |
|
13 |
Ulrich |
14 |
|
15 |
|
16 |
From 16165052ae2135d499ccd4f353c867ccd03ae849 Mon Sep 17 00:00:00 2001 |
17 |
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o> |
18 |
Date: Tue, 3 Nov 2015 21:31:59 +0100 |
19 |
Subject: [PATCH] fixup! EAPI 6 has einstalldocs. |
20 |
|
21 |
--- |
22 |
pkg-mgr-commands.tex | 4 ++-- |
23 |
1 file changed, 2 insertions(+), 2 deletions(-) |
24 |
|
25 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
26 |
index b9d53bd..a548b9e 100644 |
27 |
--- a/pkg-mgr-commands.tex |
28 |
+++ b/pkg-mgr-commands.tex |
29 |
@@ -933,7 +933,7 @@ has returned. |
30 |
\caption{\t{einstalldocs} logic} \label{alg:einstalldocs} |
31 |
\begin{algorithmic}[1] |
32 |
\STATE save the value of the install directory for \t{dodoc} |
33 |
-\STATE call \t{docinto .} \COMMENT{sets the directory to \t{/usr/share/doc/\$\{PF\}}} |
34 |
+\STATE set the install directory for \t{dodoc} to \t{/usr/share/doc/\$\{PF\}} |
35 |
\IF{the DOCS variable is a non-empty array} |
36 |
\STATE call \t{dodoc -r "\$\{DOCS[@]\}"} |
37 |
\ELSIF{the DOCS variable is a non-empty scalar} |
38 |
@@ -946,7 +946,7 @@ has returned. |
39 |
\ENDIF |
40 |
\ENDFOR |
41 |
\ENDIF |
42 |
-\STATE call \t{docinto html} \COMMENT{sets the directory to \t{/usr/share/doc/\$\{PF\}/html}} |
43 |
+\STATE set the install directory for \t{dodoc} to \t{/usr/share/doc/\$\{PF\}/html} |
44 |
\IF{the HTML\_DOCS variable is a non-empty array} |
45 |
\STATE call \t{dodoc -r "\$\{HTML\_DOCS[@]\}"} |
46 |
\ELSIF{the HTML\_DOCS variable is a non-empty scalar} |
47 |
-- |
48 |
2.6.2 |