diff options
| author | obache <obache> | 2014-01-28 11:32:30 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-01-28 11:32:30 +0000 |
| commit | 1ebf5be84ead79a224c6a1c4d17a68755475e4aa (patch) | |
| tree | ba3f96d13b9fbdbf073dba949c89d2ad3934af95 /mk | |
| parent | 3a771d5fef4039ee4ef54bb6c9e21ba8c914b30c (diff) | |
| download | pkgsrc-1ebf5be84ead79a224c6a1c4d17a68755475e4aa.tar.gz | |
Introduce HAS_CONFIGURE_LIBDIR and GNU_CONFIGURE_LIBDIR for gnu configure
--libdir handling, same as for --mandir and --infodir.
Currently, HAS_CONFIGURE_LIBDIR=no by default unless libdir related variables
are set, but it will be switched to "yes" after all packages have been checked
(and SET_LIBDIR will be deprecated).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/gnu-configure.mk | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk index b6515845faf..007dc1619e9 100644 --- a/mk/configure/gnu-configure.mk +++ b/mk/configure/gnu-configure.mk @@ -1,11 +1,11 @@ -# $NetBSD: gnu-configure.mk,v 1.15 2013/08/31 20:22:49 rillig Exp $ +# $NetBSD: gnu-configure.mk,v 1.16 2014/01/28 11:32:30 obache Exp $ _VARGROUPS+= gnu-configure _USER_VARS.gnu-configure= # none _PKG_VARS.gnu-configure= GNU_CONFIGURE GNU_CONFIGURE_PREFIX \ SET_LIBDIR GNU_CONFIGURE_LIBSUBDIR \ - GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \ - CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \ + GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \ + CONFIGURE_HAS_LIBDIR CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \ OVERRIDE_DIRDEPTH.configure \ USE_GNU_CONFIGURE_HOST @@ -29,10 +29,20 @@ CONFIGURE_ENV+= lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+ GNU_CONFIGURE_PREFIX?= ${PREFIX} CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q} +.if (defined(SET_LIBDIR) && !empty(SET_LIBDIR)) || \ + (defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR)) || \ + (defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR)) +CONFIGURE_HAS_LIBDIR= yes +.else +CONFIGURE_HAS_LIBDIR?= no +.endif .if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR) -CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR} -.elif defined(SET_LIBDIR) && !empty(SET_LIBDIR) -CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_PREFIX}/lib +GNU_CONFIGURE_LIBDIR?= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR} +.else +GNU_CONFIGURE_LIBDIR?= ${GNU_CONFIGURE_PREFIX}/lib +.endif +.if !empty(CONFIGURE_HAS_LIBDIR:M[Yy][Ee][Ss]) +CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR} .endif USE_GNU_CONFIGURE_HOST?= yes |