Changeset 4066


Ignore:
Timestamp:
Jan 16, 2020 9:48:42 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/Mumps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r4025 r4066  
    1 prefix=@prefix@
     1@LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
     2@LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Mumps/trunk/configure

    r4049 r4066  
    704704LDFLAGS
    705705CFLAGS
     706LIBDIR_IS_DEFAULT_FALSE
     707LIBDIR_IS_DEFAULT_TRUE
    706708MAINT
    707709MAINTAINER_MODE_FALSE
     
    32993301    eval expanded_libdir=$expanded_libdir
    33003302  done
     3303
     3304   if test "$expanded_libdir" = "$prefix/lib"; then
     3305  LIBDIR_IS_DEFAULT_TRUE=
     3306  LIBDIR_IS_DEFAULT_FALSE='#'
     3307else
     3308  LIBDIR_IS_DEFAULT_TRUE='#'
     3309  LIBDIR_IS_DEFAULT_FALSE=
     3310fi
     3311
     3312
    33013313  prefix=$save_prefix
    33023314  exec_prefix=$save_exec_prefix
     
    1854118553if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1854218554  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     18555Usually this means the macro was only invoked conditionally." "$LINENO" 5
     18556fi
     18557if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
     18558  as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
    1854318559Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1854418560fi
Note: See TracChangeset for help on using the changeset viewer.