Date: Tue, 14 Nov 2000 19:55:51 +0200 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Satoshi - Ports Wraith - Asami <asami@FreeBSD.org> Cc: Roger Hardiman <roger@cs.strath.ac.uk>, ports@FreeBSD.org Subject: Re: Adding AUTOMAKE_FLAGS to bsd.port.mk Message-ID: <3A117CA7.DF54275@FreeBSD.org> References: <3A11077A.C31A158A@cs.strath.ac.uk> <3A111032.DAC862B4@FreeBSD.org> <vqcd7fyvhum.fsf@silvia.hip.berkeley.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------27BEDE83F4DF298426EDE967
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Satoshi - Ports Wraith - Asami wrote:
> * From: Maxim Sobolev <sobomax@FreeBSD.org>
>
> * Roger Hardiman wrote:
>
> * > .if defined(USE_AUTOMAKE)
> * > @(cd ${CONFIGURE_WRKSRC} && ${AUTOMAKE} ${AUTOMAKE_ARGS})
> * > .endif
>
> * Looks fine, hovewer to be consistent you should also define AUTOMAKE_ENV,
> * AUTOCONF_ARGS and AUTOCONF_ENV as well.
>
> You guys are both right. Can one of you make a patch that includes
> sobomax's suggested improvements and send it to me? :)
See attached patch.
-Maxim
--------------27BEDE83F4DF298426EDE967
Content-Type: text/plain; charset=koi8-r;
name="bsd.port.mk-amac.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="bsd.port.mk-amac.diff"
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.359
diff -d -u -r1.359 bsd.port.mk
--- ports/Mk/bsd.port.mk 2000/11/13 08:19:05 1.359
+++ ports/Mk/bsd.port.mk 2000/11/14 17:54:21
@@ -139,9 +139,15 @@
# USE_AUTOMAKE - Says that the port uses automake. Implies USE_AUTOCONF.
# AUTOMAKE - Set to path of GNU automake if not in $PATH (default:
# automake).
+# AUTOMAKE_ARGS - Pass these args to automake if ${USE_AUTOMAKE} is set.
+# AUTOMAKE_ENV - Pass these env (shell-like) to automake if
+# ${USE_AUTOMAKE} is set.
# USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE.
# AUTOCONF - Set to path of GNU autoconf if not in $PATH (default:
# autoconf).
+# AUTOCONF_ARGS - Pass these args to autoconf if ${USE_AUTOCONF} is set.
+# AUTOCONF_ENV - Pass these env (shell-like) to autoconf if
+# ${USE_AUTOCONF} is set.
# USE_LIBTOOL - Says that the port uses Libtool. Implies GNU_CONFIGURE.
# LIBTOOL - Set to path of libtool (default: libtool).
# LIBTOOLFILES - Files to patch for libtool (defaults: "aclocal.m4" if
@@ -1755,10 +1761,12 @@
.if !target(do-configure)
do-configure:
.if defined(USE_AUTOMAKE)
- @(cd ${CONFIGURE_WRKSRC} && ${AUTOMAKE})
+ @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${AUTOMAKE} \
+ ${AUTOMAKE_ARGS})
.endif
.if defined(USE_AUTOCONF)
- @(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
+ @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
+ ${AUTOCONF_ARGS})
.endif
@if [ -f ${SCRIPTDIR}/configure ]; then \
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
--------------27BEDE83F4DF298426EDE967--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3A117CA7.DF54275>