View | Details | Raw Unified | Return to bug 21903 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.port.mk (-1 / +13 lines)
Lines 139-144 Link Here
139
# USE_AUTOMAKE	- Says that the port uses automake.  Implies USE_AUTOCONF.
139
# USE_AUTOMAKE	- Says that the port uses automake.  Implies USE_AUTOCONF.
140
# AUTOMAKE		- Set to path of GNU automake if not in $PATH (default:
140
# AUTOMAKE		- Set to path of GNU automake if not in $PATH (default:
141
#				  automake).
141
#				  automake).
142
# AUTOMAKE_ARGS		- Any extra arguments to GNU automake in configure
143
#				  stages (default: none).
144
# USE_ACLOCAL	- Says that the port uses autoconf.  Implies USE_AUTOCONF.
145
# ACLOCAL		- Set to path of GNU aclocal if not in $PATH (default:
146
#				  aclocal).
142
# USE_AUTOCONF	- Says that the port uses autoconf.  Implies GNU_CONFIGURE.
147
# USE_AUTOCONF	- Says that the port uses autoconf.  Implies GNU_CONFIGURE.
143
# AUTOCONF		- Set to path of GNU autoconf if not in $PATH (default:
148
# AUTOCONF		- Set to path of GNU autoconf if not in $PATH (default:
144
#				  autoconf).
149
#				  autoconf).
Lines 759-764 Link Here
759
USE_AUTOCONF=	yes
764
USE_AUTOCONF=	yes
760
BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
765
BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
761
.endif
766
.endif
767
.if defined(USE_ACLOCAL)
768
USE_AUTOCONF=	yes
769
.endif
762
.if defined(USE_AUTOCONF)
770
.if defined(USE_AUTOCONF)
763
GNU_CONFIGURE=	yes
771
GNU_CONFIGURE=	yes
764
BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
772
BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
Lines 904-909 Link Here
904
# Miscellaneous overridable commands:
912
# Miscellaneous overridable commands:
905
GMAKE?=			gmake
913
GMAKE?=			gmake
906
AUTOMAKE?=		automake
914
AUTOMAKE?=		automake
915
ACLOCAL?=		aclocal
907
AUTOCONF?=		autoconf
916
AUTOCONF?=		autoconf
908
LIBTOOL?=		libtool
917
LIBTOOL?=		libtool
909
XMKMF?=			xmkmf -a
918
XMKMF?=			xmkmf -a
Lines 1787-1795 Link Here
1787
.if !target(do-configure)
1796
.if !target(do-configure)
1788
do-configure:
1797
do-configure:
1789
.if defined(USE_AUTOMAKE)
1798
.if defined(USE_AUTOMAKE)
1790
	@(cd ${CONFIGURE_WRKSRC} && ${AUTOMAKE})
1799
	@(cd ${CONFIGURE_WRKSRC} && ${AUTOMAKE} ${AUTOMAKE_ARGS})
1791
.endif
1800
.endif
1792
.if defined(USE_AUTOCONF)
1801
.if defined(USE_AUTOCONF)
1802
.if defined(USE_ACLOCAL)
1803
	@(cd ${CONFIGURE_WRKSRC} && ${ACLOCAL})
1804
.endif
1793
	@(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
1805
	@(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
1794
.endif
1806
.endif
1795
	@if [ -f ${SCRIPTDIR}/configure ]; then \
1807
	@if [ -f ${SCRIPTDIR}/configure ]; then \

Return to bug 21903