blob: 3e0fb09da85da381303441b12fb25673bae04eb5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
https://github.com/resurrecting-open-source-projects/scrot/pull/175
From: Sam James <sam@gentoo.org>
Date: Sun, 19 Dec 2021 23:59:45 +0000
Subject: [PATCH 1/2] build: respect docdir
Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream
versioning for patches):
```
>>> /usr/share/doc/scrot-1.7-r1/
>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
>>> /usr/share/doc/scrot/
>>> /usr/share/doc/scrot/scrot.png
>>> /usr/share/doc/scrot/README.md.bz2
>>> /usr/share/doc/scrot/ChangeLog.bz2
>>> /usr/share/doc/scrot/AUTHORS.bz2
```
After:
```
>>> /usr/share/doc/scrot-1.7-r1/scrot.png
>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
```
This avoids installing duplicate files & installs them to the
same location but it's overridable by --docdir in ./configure which
helps downstreams.
Bug: https://bugs.gentoo.org/828928
Signed-off-by: Sam James <sam@gentoo.org>
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in
man_MANS = man/scrot.1
-docs_DATA = README.md AUTHORS ChangeLog doc/scrot.png
-docsdir = $(prefix)/share/doc/scrot
+doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
-EXTRA_DIST = man/scrot.1 $(docs_DATA)
+EXTRA_DIST = man/scrot.1
SUBDIRS = src
From: Sam James <sam@gentoo.org>
Date: Mon, 20 Dec 2021 00:03:35 +0000
Subject: [PATCH 2/2] build: simplify man page installation
Signed-off-by: Sam James <sam@gentoo.org>
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ man_MANS = man/scrot.1
doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
-EXTRA_DIST = man/scrot.1
+EXTRA_DIST = $(man_MANS)
SUBDIRS = src
|
