diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2013-07-16 05:42:36 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2013-07-16 05:42:36 +0000 |
| commit | b3b33257e512916a4f977c9026941425a3aa916a (patch) | |
| tree | 2262a68c0e24ffd52c4e9969c5287660fcb39bb7 /Mk/bsd.autotools.mk | |
| parent | 1babe2feaefe5db9a31b19512e77709289cdf098 (diff) | |
| download | ports-b3b33257e512916a4f977c9026941425a3aa916a.tar.gz ports-b3b33257e512916a4f977c9026941425a3aa916a.zip | |
Notes
Diffstat (limited to 'Mk/bsd.autotools.mk')
| -rw-r--r-- | Mk/bsd.autotools.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index 8cf68aab195b..c03805f0c9f0 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -142,8 +142,8 @@ GNU_CONFIGURE= yes .endif .if defined(_AUTOTOOL_automake) -AUTOMAKE_VERSION= 1.12 -AUTOMAKE_APIVER= 1.12.6 +AUTOMAKE_VERSION= 1.14 +AUTOMAKE_APIVER= 1.14 AUTOMAKE_PORT= devel/automake . if ${_AUTOTOOL_automake} == "yes" @@ -176,7 +176,10 @@ AUTOMAKE_DIR= ${LOCALBASE}/share/automake-${AUTOMAKE_VERSION} ACLOCAL= ${LOCALBASE}/bin/aclocal-${AUTOMAKE_VERSION} ACLOCAL_DIR= ${LOCALBASE}/share/aclocal-${AUTOMAKE_VERSION} -. if defined(_AUTOTOOL_aclocal) || defined(_AUTOTOOL_aclocal14) +. if defined(_AUTOTOOL_aclocal) +ACLOCAL_ARGS?= --automake-acdir=${ACLOCAL_DIR} +. endif +. if defined(_AUTOTOOL_aclocal14) ACLOCAL_ARGS?= --acdir=${ACLOCAL_DIR} . endif |