Changeset 1509


Ignore:
Timestamp:
Apr 24, 2010 12:31:26 PM (10 years ago)
Author:
stefan
Message:

add cludge to handle different usual locations for project libraries

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/split/coin.m4

    r1507 r1509  
    38093809    # add CYGPATH_W cludge into include flags
    38103810    # replace -L${libdir} by absolute path to build directory in linker flags
     3811    # we assume that the build directory is $3/src if this directory exists, otherwise we assume that it is $3
    38113812    m4_toupper($1_CFLAGS)=[`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp'] $3/$2-uninstalled.pc`
    38123813    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' $3/$2-uninstalled.pc`
    38133814    if test "x$projectlibs" != x ; then
    3814       m4_toupper($1_LIBS)="-L`cd $3; pwd` $projectlibs"
     3815      if test -d $3/src ; then
     3816        m4_toupper($1_LIBS)="-L`cd $3/src; pwd` $projectlibs"
     3817      else
     3818        m4_toupper($1_LIBS)="-L`cd $3; pwd` $projectlibs"
     3819      fi
    38153820    fi
    38163821    m4_toupper($1_DATA)=`sed -n -e 's/datadir=//gp' $3/$2-uninstalled.pc`
Note: See TracChangeset for help on using the changeset viewer.