aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
blob: 36d7be6fd0a37c3d19a2383e2ca4f1f2afff9bfd (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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
# patch is from openembedded:
#    commit 2db61370333f7a2fc1dbb86385734883387e0217
#    Author: Martin Jansa <Martin.Jansa@gmail.com>
#    Date:   Fri Apr 2 07:34:46 2010 +0200
#
#    shadow: fix do_install with automake-1.11
#    
#    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
#
# comment added by Kevin Tian <kevin.tian@intel.com>

man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice

diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am
--- shadow-4.1.4.2.orig/man/Makefile.am	2009-03-14 15:40:10.000000000 +0100
+++ shadow-4.1.4.2/man/Makefile.am	2010-04-02 07:31:17.000000000 +0200
@@ -163,7 +163,6 @@
 	$(man_MANS) \
 	$(man_XMANS) \
 	$(addprefix login.defs.d/,$(login_defs_v)) \
-	$(man_nopam) \
 	id.1 \
 	id.1.xml \
 	sulogin.8 \
diff -uNr shadow-4.1.4.2.orig/man/fr/Makefile.am shadow-4.1.4.2/man/fr/Makefile.am
--- shadow-4.1.4.2.orig/man/fr/Makefile.am	2008-09-06 18:44:45.000000000 +0200
+++ shadow-4.1.4.2/man/fr/Makefile.am	2010-04-02 07:42:11.000000000 +0200
@@ -52,7 +52,6 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1
 
 include ../generate_translations.mak
diff -uNr shadow-4.1.4.2.orig/man/it/Makefile.am shadow-4.1.4.2/man/it/Makefile.am
--- shadow-4.1.4.2.orig/man/it/Makefile.am	2008-09-06 18:44:45.000000000 +0200
+++ shadow-4.1.4.2/man/it/Makefile.am	2010-04-02 07:42:20.000000000 +0200
@@ -46,7 +46,6 @@
                         
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	logoutd.8
 
diff -uNr shadow-4.1.4.2.orig/man/ja/Makefile.am shadow-4.1.4.2/man/ja/Makefile.am
--- shadow-4.1.4.2.orig/man/ja/Makefile.am	2007-12-31 17:48:28.000000000 +0100
+++ shadow-4.1.4.2/man/ja/Makefile.am	2010-04-02 07:42:17.000000000 +0200
@@ -49,7 +49,6 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	shadow.3 \
 	sulogin.8
diff -uNr shadow-4.1.4.2.orig/man/pl/Makefile.am shadow-4.1.4.2/man/pl/Makefile.am
--- shadow-4.1.4.2.orig/man/pl/Makefile.am	2008-09-06 18:44:45.000000000 +0200
+++ shadow-4.1.4.2/man/pl/Makefile.am	2010-04-02 07:42:07.000000000 +0200
@@ -49,7 +49,6 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	getspnam.3 \
 	id.1 \
 	shadow.3 \
diff -uNr shadow-4.1.4.2.orig/man/ru/Makefile.am shadow-4.1.4.2/man/ru/Makefile.am
--- shadow-4.1.4.2.orig/man/ru/Makefile.am	2010-04-02 07:39:00.000000000 +0200
+++ shadow-4.1.4.2/man/ru/Makefile.am	2010-04-02 07:42:01.000000000 +0200
@@ -54,7 +54,6 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	sulogin.8
 
diff -uNr shadow-4.1.4.2.orig/man/sv/Makefile.am shadow-4.1.4.2/man/sv/Makefile.am
--- shadow-4.1.4.2.orig/man/sv/Makefile.am	2008-09-06 18:44:45.000000000 +0200
+++ shadow-4.1.4.2/man/sv/Makefile.am	2010-04-02 07:42:24.000000000 +0200
@@ -53,8 +53,7 @@
 endif
 
 EXTRA_DIST = \
-	$(man_MANS) \
-	$(man_nopam)
+	$(man_MANS)
 
 include ../generate_translations.mak
 
--- shadow-4.1.4.2.orig/man/ru/Makefile.am	2010-04-02 07:54:09.000000000 +0200
+++ shadow-4.1.4.2/man/ru/Makefile.am	2010-04-02 07:51:57.000000000 +0200
@@ -1,7 +1,6 @@
 mandir = @mandir@/ru
 
 man_MANS = \
-	$(man_nopam) \
 	chage.1 \
 	chfn.1 \
 	chgpasswd.8 \