summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-10-07 21:47:49 +0000
committerwiz <wiz@pkgsrc.org>2002-10-07 21:47:49 +0000
commite5ebd8f39ac6eae4cf2dd3ed95940721feb478d6 (patch)
treeadc01517aaefc7c9bffa2e970828f141f25204ab
parentbbbbe0463306ca2bc82a18d4eb6ca3de4459c020 (diff)
downloadpkgsrc-e5ebd8f39ac6eae4cf2dd3ed95940721feb478d6.tar.gz
Move BUILD_USES_GETTEXT_M4 logic to automake.mk.
-rw-r--r--mk/automake.mk6
-rw-r--r--mk/bsd.pkg.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/automake.mk b/mk/automake.mk
index 0a37cd7e1f6..46880bc2255 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.2 2002/10/03 19:36:36 wiz Exp $
+# $NetBSD: automake.mk,v 1.3 2002/10/07 21:47:49 wiz Exp $
#
# makefile fragment for packages that use automake
# AUTOMAKE_REQD can be set to the minimum version required.
@@ -29,5 +29,9 @@ AUTOCONF_REQD?= 2.13
AUTOMAKE= ${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
ACLOCAL= ${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
+.if defined(BUILD_USES_GETTEXT_M4)
+BUILD_DEPENDS+= {gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
+.endif
+
.include "../../mk/autoconf.mk"
.endif # AUTOMAKE_MK
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6cdf2f5375e..bdcf6f0c748 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1063 2002/10/04 11:19:26 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1064 2002/10/07 21:47:51 wiz Exp $
#
# This file is in the public domain.
#
@@ -357,10 +357,6 @@ DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d
BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
.endif
-.if defined(BUILD_USES_GETTEXT_M4)
-BUILD_DEPENDS+= {gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
-.endif
-
EXTRACT_COOKIE= ${WRKDIR}/.extract_done
BUILDLINK_COOKIE= ${WRKDIR}/.buildlink_done
CONFIGURE_COOKIE= ${WRKDIR}/.configure_done