Changeset 3653


Ignore:
Timestamp:
Aug 11, 2016 6:00:28 AM (3 years ago)
Author:
stefan
Message:

add prefix back into COIN_PKG_CONFIG_PATH; also add users PKG_CONFIG_PATH into COIN_PKG_CONFIG_PATH

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r3630 r3653  
    492492
    493493# assemble pkg-config search path
    494 COIN_PKG_CONFIG_PATH=
     494COIN_PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
    495495AC_SUBST(COIN_PKG_CONFIG_PATH)
     496
     497# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     498# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     499# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     500if test "x${prefix}" = xNONE ; then
     501  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     502else
     503  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     504fi
    496505
    497506])
     
    617626    # need to export variable to be sure that the following pkg-config gets these values
    618627    coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    619     PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$PKG_CONFIG_PATH"
     628    PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
    620629    export PKG_CONFIG_PATH
    621630   
     
    686695# do pkg-config calls to complete LIBS and CFLAGS
    687696coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    688 PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH:$COIN_PKG_CONFIG_PATH_UNINSTALLED"
     697PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH"
    689698export PKG_CONFIG_PATH
    690699
Note: See TracChangeset for help on using the changeset viewer.