1 |
flameeyes 08/01/13 18:41:28 |
2 |
|
3 |
Modified: autotools.eclass |
4 |
Log: |
5 |
Support packages that use GNUmakefile.am sa automake start file. Patch by Luca Bruno in bug #205606. |
6 |
|
7 |
Revision Changes Path |
8 |
1.70 eclass/autotools.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.70&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.70&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.69&r2=1.70 |
13 |
|
14 |
Index: autotools.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
17 |
retrieving revision 1.69 |
18 |
retrieving revision 1.70 |
19 |
diff -u -r1.69 -r1.70 |
20 |
--- autotools.eclass 7 Jan 2008 02:54:49 -0000 1.69 |
21 |
+++ autotools.eclass 13 Jan 2008 18:41:28 -0000 1.70 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.69 2008/01/07 02:54:49 vapier Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.70 2008/01/13 18:41:28 flameeyes Exp $ |
27 |
# |
28 |
# Maintainer: base-system@g.o |
29 |
# |
30 |
@@ -140,7 +140,7 @@ |
31 |
lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")" |
32 |
[[ -n $lttest ]] || return 0 |
33 |
|
34 |
- [[ -f Makefile.am ]] && opts="--automake" |
35 |
+ [[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake" |
36 |
|
37 |
[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize" |
38 |
autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts} |
39 |
@@ -168,16 +168,23 @@ |
40 |
|
41 |
eautomake() { |
42 |
local extra_opts |
43 |
+ local makefile_name |
44 |
|
45 |
- [[ -f Makefile.am ]] || return 0 |
46 |
+ if [[ -f GNUmakefile.am ]]; then |
47 |
+ makefile_name="GNUmakefile" |
48 |
+ elif [[ -f Makefile.am ]]; then |
49 |
+ makefile_name="Makefile" |
50 |
+ else |
51 |
+ return 0 |
52 |
+ fi |
53 |
|
54 |
- if [[ -z ${FROM_EAUTORECONF} && -f Makefile.in ]]; then |
55 |
+ if [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name}.in ]]; then |
56 |
local used_automake |
57 |
local installed_automake |
58 |
|
59 |
installed_automake=$(automake --version | head -n 1 | \ |
60 |
sed -e 's:.*(GNU automake) ::') |
61 |
- used_automake=$(head -n 1 < Makefile.in | \ |
62 |
+ used_automake=$(head -n 1 < ${makefile_name}.in | \ |
63 |
sed -e 's:.*by automake \(.*\) from .*:\1:') |
64 |
|
65 |
if [[ ${installed_automake} != ${used_automake} ]]; then |
66 |
|
67 |
|
68 |
|
69 |
-- |
70 |
gentoo-commits@l.g.o mailing list |