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 750-755 Link Here
750
USE_AUTOCONF=	yes
755
USE_AUTOCONF=	yes
751
BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
756
BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
752
.endif
757
.endif
758
.if defined(USE_ACLOCAL)
759
USE_AUTOCONF=	yes
760
.endif
753
.if defined(USE_AUTOCONF)
761
.if defined(USE_AUTOCONF)
754
GNU_CONFIGURE=	yes
762
GNU_CONFIGURE=	yes
755
BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
763
BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
Lines 895-900 Link Here
895
# Miscellaneous overridable commands:
903
# Miscellaneous overridable commands:
896
GMAKE?=			gmake
904
GMAKE?=			gmake
897
AUTOMAKE?=		automake
905
AUTOMAKE?=		automake
906
ACLOCAL?=		aclocal
898
AUTOCONF?=		autoconf
907
AUTOCONF?=		autoconf
899
LIBTOOL?=		libtool
908
LIBTOOL?=		libtool
900
XMKMF?=			xmkmf -a
909
XMKMF?=			xmkmf -a
Lines 1784-1792 Link Here
1784
.if !target(do-configure)
1793
.if !target(do-configure)
1785
do-configure:
1794
do-configure:
1786
.if defined(USE_AUTOMAKE)
1795
.if defined(USE_AUTOMAKE)
1787
	@(cd ${WRKSRC} && ${AUTOMAKE})
1796
	@(cd ${WRKSRC} && ${AUTOMAKE} ${AUTOMAKE_ARGS})
1788
.endif
1797
.endif
1789
.if defined(USE_AUTOCONF)
1798
.if defined(USE_AUTOCONF)
1799
.if defined(USE_ACLOCAL)
1800
	@(cd ${WRKSRC} && ${ACLOCAL})
1801
.endif
1790
	@(cd ${WRKSRC} && ${AUTOCONF})
1802
	@(cd ${WRKSRC} && ${AUTOCONF})
1791
.endif
1803
.endif
1792
	@if [ -f ${SCRIPTDIR}/configure ]; then \
1804
	@if [ -f ${SCRIPTDIR}/configure ]; then \

Return to bug 21903