diff options
| author | sbd <sbd> | 2012-01-26 06:33:43 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-01-26 06:33:43 +0000 |
| commit | 73f333146e4ef1103af2d2615f926f0d06e3d48a (patch) | |
| tree | b588a56fca18cbe77a507ec0d06510516f02e4fc /mk | |
| parent | 1685a43d4867ded66a1eafe4888f26f288dab9a9 (diff) | |
| download | pkgsrc-73f333146e4ef1103af2d2615f926f0d06e3d48a.tar.gz | |
Add SET_LIBDIR variable which if non-empty will set GNU_CONFIGURE_LIBDIR to
the default libdir (and there for be passed to ./configure), this is the
best way to deal with the 'lib64' problem on x86_64-linux systems (with
most some packages).
Also add SET_LIBDIR, GNU_CONFIGURE_LIBDIR, and GNU_CONFIGURE_LIBSUBDIR to
_PKG_VARS.gnu-configure
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/gnu-configure.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk index 40683024f51..0dcc9da6d09 100644 --- a/mk/configure/gnu-configure.mk +++ b/mk/configure/gnu-configure.mk @@ -1,8 +1,9 @@ -# $NetBSD: gnu-configure.mk,v 1.12 2012/01/17 21:19:43 sbd Exp $ +# $NetBSD: gnu-configure.mk,v 1.13 2012/01/26 06:33:43 sbd 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 \ GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \ CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \ OVERRIDE_DIRDEPTH.configure \ @@ -30,6 +31,8 @@ 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} +.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} |