diff options
| author | jkh <jkh@FreeBSD.org> | 1994-08-21 14:10:16 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-08-21 14:10:16 +0000 |
| commit | 42f31844db5a5eb6866b62aa9481df4adeb5c41d (patch) | |
| tree | 4c46d6eb18b05b84dcc255c3c25879856f09239c | |
| parent | e77d451213da0b4f3a4fb6695fb6dabb12d44b7e (diff) | |
| download | FreeBSD-src-42f31844db5a5eb6866b62aa9481df4adeb5c41d.zip FreeBSD-src-42f31844db5a5eb6866b62aa9481df4adeb5c41d.tar.gz | |
Make any local configuration file unconditional. That is, if one exists
then run it even if GNU configure is to be run later.
Submitted by: jkh
| -rw-r--r-- | share/mk/bsd.port.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index afb7777..870ba11 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -1,7 +1,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id$ +# $Id: bsd.port.mk,v 1.1 1994/08/21 13:12:57 jkh Exp $ # # Supported Variables and their behaviors: @@ -103,13 +103,6 @@ configure: extract patch -d ${WRKSRC} --quiet -E -p0 < $$i; \ done; \ fi -.if defined(GNU_CONFIGURE) -.if !defined(GNU_CONFIGURE_ARGS) - @(cd ${WRKSRC}; ./configure i386--freebsd) -.else !defined(GNU_CONFIGURE_ARGS) - @(cd ${WRKSRC}; ./configure ${GNU_CONFIGURE_ARGS}) -.endif -.endif # We have a small convention for our local configure scripts, which # is that ${.CURDIR} and the package working directory get passed as # command-line arguments since all other methods are a little @@ -117,6 +110,13 @@ configure: extract @if [ -f ${SCRIPTDIR}/configure ]; then \ sh ${SCRIPTDIR}/configure ${.CURDIR} ${WRKSRC}; \ fi +.if defined(GNU_CONFIGURE) +.if !defined(GNU_CONFIGURE_ARGS) + @(cd ${WRKSRC}; ./configure i386--freebsd) +.else !defined(GNU_CONFIGURE_ARGS) + @(cd ${WRKSRC}; ./configure ${GNU_CONFIGURE_ARGS}) +.endif +.endif .endif .if !target(extract) |
