Changeset 4063 for ThirdParty/Glpk/trunk


Ignore:
Timestamp:
Jan 16, 2020 9:47:58 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/Glpk/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/coinglpk.pc.in

    r4061 r4063  
    1 prefix=@prefix@
     1@LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
     2@LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Glpk/trunk/configure

    r4061 r4063  
    596596LIBOBJS
    597597subdirs
     598LIBDIR_IS_DEFAULT_FALSE
     599LIBDIR_IS_DEFAULT_TRUE
    598600MAINT
    599601MAINTAINER_MODE_FALSE
     
    26722674    eval expanded_libdir=$expanded_libdir
    26732675  done
     2676
     2677   if test "$expanded_libdir" = "$prefix/lib"; then
     2678  LIBDIR_IS_DEFAULT_TRUE=
     2679  LIBDIR_IS_DEFAULT_FALSE='#'
     2680else
     2681  LIBDIR_IS_DEFAULT_TRUE='#'
     2682  LIBDIR_IS_DEFAULT_FALSE=
     2683fi
     2684
     2685
    26742686  prefix=$save_prefix
    26752687  exec_prefix=$save_exec_prefix
     
    28592871if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    28602872  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     2873Usually this means the macro was only invoked conditionally." "$LINENO" 5
     2874fi
     2875if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
     2876  as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
    28612877Usually this means the macro was only invoked conditionally." "$LINENO" 5
    28622878fi
Note: See TracChangeset for help on using the changeset viewer.