Changeset 3002


Ignore:
Timestamp:
Oct 18, 2013 6:28:27 AM (7 years ago)
Author:
stefan
Message:

merge r3001 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 3001
  • stable/0.7/coin.m4

    r2987 r3002  
    16501650
    16511651LIBTOOL=
    1652 if test -r ../libtool; then
     1652if test -f ../libtool; then
    16531653  coin_config_dir=..
    16541654  LIBTOOL='$(SHELL) $(top_builddir)/../libtool'
    16551655fi
    16561656if test "x$LIBTOOL" = x; then
    1657   if test -r ../../libtool; then
     1657  if test -f ../../libtool; then
    16581658    coin_config_dir=../..
    16591659    LIBTOOL='$(SHELL) $(top_builddir)/../../libtool'
     
    25672567esac
    25682568
    2569 if test -r $m4_toupper(COIN_DATA_$1_PATH); then
     2569if test -d $m4_toupper(COIN_DATA_$1_PATH); then
    25702570  AC_DEFINE_UNQUOTED(m4_toupper(COIN_DATA_$1_PATH),["$m4_toupper(COIN_DATA_$1_PATH)"],
    25712571            [Define to absolute path for Data subdirectory $1])
     
    25872587AC_DEFUN([AC_COIN_LINKCOPY_FROM_FILELIST],
    25882588[cmd="$3"
    2589 if test -e $srcdir/$2 ; then
     2589if test -r $srcdir/$2 ; then
    25902590  my_target_dir="$1"
    25912591  my_link_files=`cat $srcdir/$2`
     
    25982598    if test -e $my_target_dir/$i; then : ; else
    25992599      dirn2=`AS_DIRNAME($my_target_dir/$i)`
    2600       if test -e $dirn2; then : ; else
     2600      if test -d $dirn2; then : ; else
    26012601        AS_MKDIR_P($dirn2)
    26022602      fi
     
    31013101  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
    31023102  COIN_PKG_CONFIG_PATH_UNINSTALLED=
    3103   if test -e ../coin_subdirs.txt ; then
     3103  if test -f ../coin_subdirs.txt ; then
    31043104    for i in `cat ../coin_subdirs.txt` ; do
    31053105      if test -d ../$i ; then
     
    31123112  fi
    31133113
    3114   if test -e ../../coin_subdirs.txt ; then
     3114  if test -f ../../coin_subdirs.txt ; then
    31153115    for i in `cat ../../coin_subdirs.txt` ; do
    31163116      if test -d ../../$i ; then
Note: See TracChangeset for help on using the changeset viewer.