summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2007-03-01 22:29:15 +0000
committerwiz <wiz>2007-03-01 22:29:15 +0000
commit728014360cbd5536b230aab64e54f7bb010e8105 (patch)
treeffcd8ce2dc15df3ce359b525b9f5d5f9206300b5
parent88ac76f344b73eab675b8af68d6a4c673985a90e (diff)
downloadpkgsrc-728014360cbd5536b230aab64e54f7bb010e8105.tar.gz
Deprecate unused BUILD_USES_GETTEXT_M4 variable.
-rw-r--r--doc/guide/files/fixes.xml9
-rw-r--r--mk/tools/automake.mk9
2 files changed, 2 insertions, 16 deletions
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 204924331cb..16af55ef776 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.80 2007/02/19 15:22:29 reed Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.81 2007/03/01 22:29:15 wiz Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -395,13 +395,6 @@
role="pkg">print/ghostscript</filename> package for an example.
(It relies on the jpeg sources being present in source form
during the build.)</para>
-
- <para>Please also note the
- <varname>BUILD_USES_GETTEXT_M4</varname> definition, which is
- provided as convenience definition. It adds a build dependency on
- either an installed version of an older gettext package, or if it
- isn't, installs the <filename
- role="pkg">devel/gettext-m4</filename> package.</para>
</sect2>
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index 8404fc1fbe0..2e39171a638 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.17 2006/12/05 22:48:31 wiz Exp $
+# $NetBSD: automake.mk,v 1.18 2007/03/01 22:29:15 wiz Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,13 +71,6 @@
# AUTOMAKE_OVERRIDE= no
#
-# This variable is obsoleted, but continue to allow it until packages
-# have been taught to use the new syntax.
-#
-.if defined(BUILD_USES_GETTEXT_M4)
-USE_TOOLS+= gettext-m4
-.endif
-
# Only allow one of "automake" and "automake14" in USE_TOOLS.
.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \
!empty(USE_TOOLS:C/:.*//:Mautomake14)