Changeset 4065


Ignore:
Timestamp:
Jan 16, 2020 9:48:19 AM (5 months ago)
Author:
stefan
Message:

set prefix in .pc file relative to pcfiledir, if libdir unchanged; for coin-or/Cbc#281

Location:
ThirdParty/Metis/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/trunk/coinmetis.pc.in

    r4024 r4065  
    1 prefix=@prefix@
     1@LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
     2@LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Metis/trunk/configure

    r4048 r4065  
    689689LDFLAGS
    690690CFLAGS
     691LIBDIR_IS_DEFAULT_FALSE
     692LIBDIR_IS_DEFAULT_TRUE
    691693MAINT
    692694MAINTAINER_MODE_FALSE
     
    31673169    eval expanded_libdir=$expanded_libdir
    31683170  done
     3171
     3172   if test "$expanded_libdir" = "$prefix/lib"; then
     3173  LIBDIR_IS_DEFAULT_TRUE=
     3174  LIBDIR_IS_DEFAULT_FALSE='#'
     3175else
     3176  LIBDIR_IS_DEFAULT_TRUE='#'
     3177  LIBDIR_IS_DEFAULT_FALSE=
     3178fi
     3179
     3180
    31693181  prefix=$save_prefix
    31703182  exec_prefix=$save_exec_prefix
     
    1247312485if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1247412486  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     12487Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12488fi
     12489if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
     12490  as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
    1247512491Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1247612492fi
Note: See TracChangeset for help on using the changeset viewer.