automake

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

automake

Jacob Meuser
according to bsd.port.mk(5), 'automake' should be added to
CONFIGURE_STYLE if automake may need to be rerun.

however, there is no explicit support for running automake.

below is a patch to gnu.port.mk to actually run automake
if automake is in CONFIGURE_STYLE.

comments?

I haven't made a patch for bsd.port.mk to document this yet,
because, well, I'm not sure if this is the right way to do this,
or if it is even wanted, but it seems to be working correctly for
me.

--
<[hidden email]>

Index: gnu.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/gnu.port.mk,v
retrieving revision 1.22
diff -u -r1.22 gnu.port.mk
--- gnu.port.mk 7 Feb 2005 12:22:28 -0000 1.22
+++ gnu.port.mk 16 Dec 2005 07:22:10 -0000
@@ -11,8 +11,13 @@
 
 .if ${CONFIGURE_STYLE:L:Mautomake}
 AUTOMAKE_VERSION?= 1.4
-BUILD_DEPENDS+= ${MODGNU_AUTOMAKE_DEPENDS}
-MAKE_ENV+= AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+BUILD_DEPENDS+= ${MODGNU_AUTOMAKE_DEPENDS} ${MODGNU_AUTOCONF_DEPENDS}
+AUTOMAKE?= automake
+ACLOCAL?= aclocal
+AUTOMAKE_DIR?=${WRKSRC}
+# missing ?= not an oversight
+AUTOMAKE_ENV=PATH=${PORTPATH} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOCONF_VERSION=${AUTOCONF_VERSION}
+MAKE_ENV+=AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOCONF_VERSION=${AUTOCONF_VERSION}
 .endif
 .if ${CONFIGURE_STYLE:L:Mautoupdate}
 CONFIGURE_STYLE+=autoconf
@@ -95,6 +100,9 @@
 .    endif
 .    if !${CONFIGURE_STYLE:L:Mautomake}
 REORDER_DEPENDENCIES+=${PORTSDIR}/infrastructure/mk/automake.dep
+.    else
+_MODGNU_loop+= echo "Running automake-${AUTOMAKE_VERSION} in $$d";
+_MODGNU_loop+= ${_SYSTRACE_CMD} ${SETENV} ${AUTOMAKE_ENV} ${AUTOMAKE};
 .    endif
 .  endif
 .  endif