summaryrefslogtreecommitdiff
path: root/mk/configure
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-06-12 12:35:35 +0000
committerwiz <wiz@pkgsrc.org>2013-06-12 12:35:35 +0000
commitab5a823feb539c6eadcc60d7e742787ed715e92c (patch)
tree8c53925fd6406c89e3551271baa24ee01e4f3d83 /mk/configure
parent07b94cf53553064b6eebc7476603aaca0310df58 (diff)
downloadpkgsrc-ab5a823feb539c6eadcc60d7e742787ed715e92c.tar.gz
Remove GNU_CONFIGURE_LIBDIR.
Rationale: undocumented, easily replaced with "CONFIGURE_ARGS+=--libdir=" and only used by 10 packages.
Diffstat (limited to 'mk/configure')
-rw-r--r--mk/configure/gnu-configure.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk
index 0dcc9da6d09..14074ab7466 100644
--- a/mk/configure/gnu-configure.mk
+++ b/mk/configure/gnu-configure.mk
@@ -1,9 +1,9 @@
-# $NetBSD: gnu-configure.mk,v 1.13 2012/01/26 06:33:43 sbd Exp $
+# $NetBSD: gnu-configure.mk,v 1.14 2013/06/12 12:35:35 wiz Exp $
_VARGROUPS+= gnu-configure
_USER_VARS.gnu-configure= # none
_PKG_VARS.gnu-configure= GNU_CONFIGURE GNU_CONFIGURE_PREFIX \
- SET_LIBDIR GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
+ SET_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
OVERRIDE_DIRDEPTH.configure \
@@ -30,12 +30,9 @@ GNU_CONFIGURE_PREFIX?= ${PREFIX}
CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q}
.if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR)
-GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
+CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
.elif defined(SET_LIBDIR) && !empty(SET_LIBDIR)
-GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib
-.endif
-.if defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR)
-CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR:Q}
+CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib
.endif
USE_GNU_CONFIGURE_HOST?= yes