Changeset 4062


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

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/coinasl.pc.in

    r4022 r4062  
    1 prefix=@prefix@
     1@LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
     2@LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/ASL/trunk/configure

    r4047 r4062  
    688688LDFLAGS
    689689CFLAGS
     690LIBDIR_IS_DEFAULT_FALSE
     691LIBDIR_IS_DEFAULT_TRUE
    690692MAINT
    691693MAINTAINER_MODE_FALSE
     
    31293131    eval expanded_libdir=$expanded_libdir
    31303132  done
     3133
     3134   if test "$expanded_libdir" = "$prefix/lib"; then
     3135  LIBDIR_IS_DEFAULT_TRUE=
     3136  LIBDIR_IS_DEFAULT_FALSE='#'
     3137else
     3138  LIBDIR_IS_DEFAULT_TRUE='#'
     3139  LIBDIR_IS_DEFAULT_FALSE=
     3140fi
     3141
     3142
    31313143  prefix=$save_prefix
    31323144  exec_prefix=$save_exec_prefix
     
    1254812560if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1254912561  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     12562Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12563fi
     12564if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
     12565  as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
    1255012566Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1255112567fi
Note: See TracChangeset for help on using the changeset viewer.