diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 20:07:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 20:07:59 +0000 |
| commit | 2bb24f15f17cde7494cc69e5dac941f474ec8605 (patch) | |
| tree | 77aa2e325b82a73660278dbb13238e6aac0adca7 /wm | |
| parent | a78a94a4f6f91c29d1969aa948a3f809f479fc73 (diff) | |
| download | pkgsrc-2bb24f15f17cde7494cc69e5dac941f474ec8605.tar.gz | |
Remove mk/autoconf.mk and mk/automake.mk and replace their usage with
USE_TOOLS and any of "autoconf", "autoconf213", "automake" or
"automake14". Also, we don't need to call the auto* tools via
${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care
to symlink the correct tool to the correct name, so we can just use
aclocal, autoconf, etc.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/afterstep1/Makefile | 9 | ||||
| -rw-r--r-- | wm/e16menuedit2/Makefile | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index 6bbaf401b53..8a30c0cf2cf 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 20:08:01 jlam Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -15,8 +15,8 @@ COMMENT= NeXT-like window manager for X11 DEPENDS+= asclock-[0-9]*:../../time/asclock DEPENDS+= xp-[0-9]*:../../x11/xp -AUTOCONF_REQD= 2.13 GNU_CONFIGURE= YES +USE_TOOLS+= autoconf213 USE_LIBTOOL= YES CONFIGURE_ARGS+= --disable-staticlibs @@ -34,13 +34,12 @@ post-patch: pre-configure: cd ${WRKSRC} && \ - ${AUTOCONF} --localdir=autoconf autoconf/configure.in > configure; \ + autoconf --localdir=autoconf autoconf/configure.in > configure; \ ${CHMOD} 755 configure; \ - ${AUTOHEADER} --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; + autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; .include "../../audio/rplay/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile index 19ddb9b573b..3cd2c43baf1 100644 --- a/wm/e16menuedit2/Makefile +++ b/wm/e16menuedit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= e16menuedit2-0.0.1 @@ -14,15 +14,12 @@ DEPENDS+= enlightenment-0.16.*:../../wm/enlightenment BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes +USE_TOOLS+= automake USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes pre-configure: - cd ${WRKSRC}; \ - ${ACLOCAL}; \ - ${AUTOHEADER}; \ - ${AUTOMAKE} -a --foreign -i; \ - ${AUTOCONF} + cd ${WRKSRC}; aclocal; autoheader; automake -a --foreign -i; autoconf .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" @@ -30,5 +27,4 @@ pre-configure: .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" |