summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2004-05-08 16:14:55 +0000
committerreed <reed@pkgsrc.org>2004-05-08 16:14:55 +0000
commit91e9b985e1768eddfbcf1cca3bafe92d66fb53d9 (patch)
tree7ebdb4744dc613cfca0c95a7f2fd96626a43a3d7
parent311a30823878b9bfa175c718f561bc982b12b93d (diff)
downloadpkgsrc-91e9b985e1768eddfbcf1cca3bafe92d66fb53d9.tar.gz
Rename NO_CONFIGURE_INFODIR to CONFIGURE_HAS_INFODIR (which defaults to
"yes"). So any packages that have old GNU configure script that does not support --infodir option (while using INFO_FILES) can set CONFIGURE_HAS_INFODIR=NO. This was suggested by agc@ as a clearer definition.
-rw-r--r--devel/m4/Makefile4
-rw-r--r--editors/ed/Makefile4
-rw-r--r--mk/bsd.pkg.mk5
-rw-r--r--sysutils/findutils/Makefile4
4 files changed, 9 insertions, 8 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 2ee3e4fe1b8..a05812f4ddb 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/05/08 02:08:38 reed Exp $
+# $NetBSD: Makefile,v 1.28 2004/05/08 16:14:55 reed Exp $
#
DISTNAME= m4-1.4
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
-NO_CONFIGURE_INFODIR= yes
+CONFIGURE_HAS_INFODIR= no
MAKE_ENV+= INFO_DIR=${INFO_DIR}
INFO_FILES= m4.info
USE_MAKEINFO= yes
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index b15174ffbc6..da526f30bb2 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/05/08 02:08:38 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/08 16:14:55 reed Exp $
DISTNAME= ed-0.2
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/software/ed/ed.html
COMMENT= GNU version of line-oriented text editor
GNU_CONFIGURE= YES
-NO_CONFIGURE_INFODIR= YES
+CONFIGURE_HAS_INFODIR= NO
MAKE_ENV+= INFO_DIR=${INFO_DIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3fbc13a36a5..b36db844761 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1455 2004/05/08 02:13:00 reed Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1456 2004/05/08 16:14:55 reed Exp $
#
# This file is in the public domain.
#
@@ -1305,7 +1305,8 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
. endif
-. if !empty(INFO_FILES) && !defined(NO_CONFIGURE_INFODIR)
+CONFIGURE_HAS_INFODIR?= yes
+. if !empty(INFO_FILES) && !empty(CONFIGURE_HAS_INFODIR:M[yY][eE][sS])
CONFIGURE_ARGS+= --infodir=${PREFIX}/${INFO_DIR}
. endif
#
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
index 8d74c0d20c3..6a32abe676f 100644
--- a/sysutils/findutils/Makefile
+++ b/sysutils/findutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/08 02:08:38 reed Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/08 16:14:55 reed Exp $
DISTNAME= findutils-4.1
PKGREVISION= 3
@@ -11,7 +11,7 @@ COMMENT= The GNU find, xargs and locate utilities
USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
-NO_CONFIGURE_INFODIR= YES
+CONFIGURE_HAS_INFODIR= NO
MAKE_ENV+= INFO_DIR=${INFO_DIR}
INFO_FILES= find.info