diff options
| author | wiz <wiz> | 2002-10-03 19:36:36 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-10-03 19:36:36 +0000 |
| commit | a49c4f761ef52d451e01106d3f86c8f5b37770ef (patch) | |
| tree | 611e7e6f0cf6c38a8be20c00cee8ec7f852b7682 /mk | |
| parent | 1fabb1b89f83cedbe3d855b559676bdbfe987a2c (diff) | |
| download | pkgsrc-a49c4f761ef52d451e01106d3f86c8f5b37770ef.tar.gz | |
Sync with new autoconf213, automake14 packages and autoconf, automake updates.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/autoconf.mk | 14 | ||||
| -rw-r--r-- | mk/automake.mk | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/mk/autoconf.mk b/mk/autoconf.mk index d5e4732aa76..52ba1952ab2 100644 --- a/mk/autoconf.mk +++ b/mk/autoconf.mk @@ -1,4 +1,4 @@ -# $NetBSD: autoconf.mk,v 1.2 2002/10/02 18:56:47 dillo Exp $ +# $NetBSD: autoconf.mk,v 1.3 2002/10/03 19:36:36 wiz Exp $ # # makefile fragment for packages that use autoconf # AUTOCONF_REQD can be set to the minimum version required. @@ -6,7 +6,7 @@ # and sets the following variables: # AUTOCONF: autoconf binary to use # AUTORECONF: autoreconf binary to use -# AUTOHEADER; autoheader binary to use +# AUTOHEADER: autoheader binary to use # .if !defined(AUTOCONF_MK) @@ -16,15 +16,15 @@ AUTOCONF_MK= # defined AUTOCONF_REQD?= 2.50 .if ${AUTOCONF_REQD:M2.1[0-9]*} == "" -BUILD_DEPENDS+= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf-devel -AUTOCONF= ${LOCALBASE}/bin/autoconf -AUTORECONF= ${LOCALBASE}/bin/autoreconf -AUTOHEADER= ${LOCALBASE}/bin/autoheader -.else BUILD_DEPENDS+= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf AUTOCONF= ${LOCALBASE}/bin/autoconf AUTORECONF= ${LOCALBASE}/bin/autoreconf AUTOHEADER= ${LOCALBASE}/bin/autoheader +.else +BUILD_DEPENDS+= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213 +AUTOCONF= ${LOCALBASE}/bin/autoconf-2.13 +AUTORECONF= ${LOCALBASE}/bin/autoreconf-2.13 +AUTOHEADER= ${LOCALBASE}/bin/autoheader-2.13 .endif .endif # AUTOCONF_MK diff --git a/mk/automake.mk b/mk/automake.mk index d64abd84f1a..0a37cd7e1f6 100644 --- a/mk/automake.mk +++ b/mk/automake.mk @@ -1,11 +1,11 @@ -# $NetBSD: automake.mk,v 1.1 2002/10/02 18:10:16 dillo Exp $ +# $NetBSD: automake.mk,v 1.2 2002/10/03 19:36:36 wiz Exp $ # # makefile fragment for packages that use automake # AUTOMAKE_REQD can be set to the minimum version required. # It adds a build dependency on the appropriate automake and autoconf # packages and sets the following variables: -# AUTOMAKE: automake binary to use -# ACLOCAL: aclocal binary to use +# AUTOMAKE: automake binary to use +# ACLOCAL: aclocal binary to use # autoconf required version will default to 2.13 if automake 1.4* is used, # and to 2.50 otherwise. # @@ -17,18 +17,17 @@ AUTOMAKE_MK= # defined AUTOMAKE_REQD?= 1.7 .if ${AUTOMAKE_REQD:M1.4*} == "" -BUILD_DEPENDS+= automake>=${AUTOMAKE_REQD}:../../devel/automake-devel +BUILD_DEPENDS+= automake>=${AUTOMAKE_REQD}:../../devel/automake _AUTOMAKE_API_VERSION= 1.7 AUTOCONF_REQD?= 2.50 .else -BUILD_DEPENDS+= automake>=${AUTOMAKE_REQD}:../../devel/automake +BUILD_DEPENDS+= automake14>=${AUTOMAKE_REQD}:../../devel/automake14 _AUTOMAKE_API_VERSION= 1.4 AUTOCONF_REQD?= 2.13 .endif AUTOMAKE= ${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION} ACLOCAL= ${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION} -#AUTOMAKE_SHAREPATH= ${LOCALBASE}/share/automake-${_AUTOMAKE_API_VERSION} .include "../../mk/autoconf.mk" .endif # AUTOMAKE_MK |