diff options
author | jlam <jlam> | 2005-05-13 16:54:12 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-05-13 16:54:12 +0000 |
commit | 0c272be600f6032d15ff638092c502f24570f824 (patch) | |
tree | 09358c9b56b5ef21125dd37e06ff067184b2bd90 /devel | |
parent | 45f364fa8833a462de6a384528e005dc22280510 (diff) | |
download | pkgsrc-0c272be600f6032d15ff638092c502f24570f824.tar.gz |
Change references to M4 & YACC into TOOLS_M4 & TOOLS_YACC to simplify
transition to new tools framework.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/autoconf/Makefile | 5 | ||||
-rw-r--r-- | devel/autoconf213/Makefile | 5 | ||||
-rw-r--r-- | devel/automake/Makefile | 4 | ||||
-rw-r--r-- | devel/buildtool/buildlink3.mk | 6 | ||||
-rw-r--r-- | devel/libsigc++/Makefile | 4 | ||||
-rw-r--r-- | devel/libsigc++2/Makefile | 4 |
6 files changed, 13 insertions, 15 deletions
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 34c607acc24..9c549d835b9 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.52 2005/05/13 16:54:12 jlam Exp $ DISTNAME= autoconf-2.59 PKGREVISION= 1 @@ -21,8 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= # empty GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-lispdir -CONFIGURE_ENV+= AWK="${AWK}" -M4= ${LOCALBASE}/bin/gm4 +TOOLS_M4= ${LOCALBASE}/bin/gm4 INFO_FILES= autoconf.info standards.info diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile index 0c3e23af957..aa1720c7fea 100644 --- a/devel/autoconf213/Makefile +++ b/devel/autoconf213/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/05/13 16:54:12 jlam Exp $ DISTNAME= autoconf-2.13 PKGNAME= autoconf213-2.13 @@ -18,9 +18,8 @@ CONFLICTS= autoconf<2.50 PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES -CONFIGURE_ENV+= AWK="${AWK}" CONFIGURE_ARGS+= --program-transform-name='s/$$/-2.13/' -M4= ${LOCALBASE}/bin/gm4 +TOOLS_M4= ${LOCALBASE}/bin/gm4 USE_MAKEINFO= YES INFO_FILES= autoconf213.info diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 9124459ca27..8e23f6d5ae0 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2005/04/11 21:45:18 tv Exp $ +# $NetBSD: Makefile,v 1.62 2005/05/13 16:54:12 jlam Exp $ # DISTNAME= automake-1.9.5 @@ -20,7 +20,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV= PERL=${PERL5} _STRIPFLAG_INSTALL= # none EVAL_PREFIX+= M4DIR=m4 -M4= ${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4 +TOOLS_M4= ${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4 INFO_FILES= automake.info diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk index a59048e5995..2edf26478c6 100644 --- a/devel/buildtool/buildlink3.mk +++ b/devel/buildtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2005/05/13 16:35:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/05/13 16:54:12 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+ @@ -23,11 +23,11 @@ CONFIGURE_ENV+= BT_FLAGS_CC=${CFLAGS:Q} CONFIGURE_ENV+= BT_FLAGS_CPP=${CPPFLAGS:Q} CONFIGURE_ENV+= BT_FLAGS_CXX=${CXXFLAGS:Q} CONFIGURE_ENV+= BT_FLAGS_LD=${LDFLAGS:Q} -CONFIGURE_ENV+= BT_PROG_AWK=${AWK:Q} +CONFIGURE_ENV+= BT_PROG_AWK=${TOOLS_AWK:Q} CONFIGURE_ENV+= BT_PROG_CC=${CC:Q} CONFIGURE_ENV+= BT_PROG_CXX=${CXX:Q} CONFIGURE_ENV+= BT_PROG_LD=${LD:Q} -CONFIGURE_ENV+= BT_PROG_M4=${M4:Q} +CONFIGURE_ENV+= BT_PROG_M4=${TOOLS_M4:Q} CONFIGURE_ARGS+= --prefix=${PREFIX} .if !target(do-build) diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index a8c2641d95c..b27d0be2345 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/18 17:08:55 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2005/05/13 16:54:12 jlam Exp $ DISTNAME= libsigc++-1.2.7 CATEGORIES= devel @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE= sigc++-1.2.pc.in -CONFIGURE_ENV+= ac_cv_prog_M4=${M4} +CONFIGURE_ENV+= ac_cv_prog_M4=${TOOLS_M4:Q} .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile index b5a95491e3d..2cb7aa1c027 100644 --- a/devel/libsigc++2/Makefile +++ b/devel/libsigc++2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/18 17:11:47 drochner Exp $ +# $NetBSD: Makefile,v 1.8 2005/05/13 16:54:13 jlam Exp $ DISTNAME= libsigc++-2.0.11 PKGNAME= libsigc++2-2.0.11 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= sigc++-2.0.pc.in -CONFIGURE_ENV+= ac_cv_prog_M4=${M4} +CONFIGURE_ENV+= ac_cv_prog_M4=${TOOLS_M4:Q} .include "../../mk/pthread.buildlink3.mk" |