Changeset 3987


Ignore:
Timestamp:
Sep 10, 2019 4:47:51 AM (5 weeks ago)
Author:
stefan
Message:

look also three level downs for coin_subdirs.txt and some other

  • for monolithic builds with coinbrew
  • same as 513244f70f in coin-or-tools/BuildTools
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.8/coin.m4

    r3805 r3987  
    14291429  if test -r $srcdir/BuildTools/coin.m4; then
    14301430    BUILDTOOLSDIR=$srcdir/BuildTools
     1431  elif test -r $srcdir/../BuildTools/coin.m4; then
     1432    BUILDTOOLSDIR=$srcdir/../BuildTools
     1433  elif test -r $srcdir/../../BuildTools/coin.m4; then
     1434    BUILDTOOLSDIR=$srcdir/../../BuildTools
     1435  elif test -r $srcdir/../../../BuildTools/coin.m4; then
     1436    BUILDTOOLSDIR=$srcdir/../../../BuildTools
    14311437  else
    1432     if test -r $srcdir/../BuildTools/coin.m4; then
    1433       BUILDTOOLSDIR=$srcdir/../BuildTools
    1434     else
    1435       if test -r $srcdir/../../BuildTools/coin.m4; then
    1436         BUILDTOOLSDIR=$srcdir/../../BuildTools
    1437       else
    1438         AC_MSG_ERROR(Cannot find the BuildTools directory, better disable maintainer mode.)
    1439       fi
    1440     fi
     1438    AC_MSG_ERROR(Cannot find the BuildTools directory, better disable maintainer mode.)
    14411439  fi
    14421440  AC_SUBST(BUILDTOOLSDIR)
     
    25252523
    25262524if test x"$m4_toupper(COIN_DATA_$1_PATH)" = x; then
    2527   m4_toupper(COIN_DATA_$1_PATH)=`cd $srcdir/../Data/$1; pwd`
     2525  if test -d $srcdir/../Data/$1 ; then
     2526    m4_toupper(COIN_DATA_$1_PATH)=`cd $srcdir/../Data/$1; pwd`
     2527  else
     2528    m4_toupper(COIN_DATA_$1_PATH)=`cd $srcdir/../../Data/$1; pwd`
     2529  fi
    25282530fi
    25292531
     
    30893091      if test -d ../../$i/pkgconfig ; then
    30903092        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     3093      fi
     3094    done
     3095  fi
     3096
     3097  if test -f ../../../coin_subdirs.txt ; then
     3098    for i in `cat ../../../coin_subdirs.txt` ; do
     3099      if test -d ../../../$i ; then
     3100        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     3101      fi
     3102      if test -d ../../../$i/pkgconfig ; then
     3103        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    30913104      fi
    30923105    done
Note: See TracChangeset for help on using the changeset viewer.