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
This commit is contained in:
parent
e77d451213
commit
42f31844db
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user