Changeset 2112


Ignore:
Timestamp:
Feb 27, 2011 12:51:38 PM (9 years ago)
Author:
stefan
Message:

merge chgsets 2105 and 2111 from trunk: fixes to maintainer mode

Location:
stable/0.6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/Makemain.inc

    r1957 r2112  
    5555        cp $< $@
    5656
    57 # Take care of updating externals (if Externals file exists)
     57# Take care of updating externals (if Dependencies file exists)
    5858if HAVE_EXTERNALS
    59 $(top_builddir)/Makefile: .Externals-stamp
     59$(top_builddir)/Makefile: .Dependencies-stamp
    6060
    61 .Externals-stamp: $(srcdir)/Externals
    62         cd $(srcdir); svn propset svn:externals -F Externals .
    63         touch .Externals-stamp
     61.Dependencies-stamp: $(srcdir)/Dependencies
     62        cd $(srcdir); BuildTools/set_externals Dependencies
     63        touch .Dependencies-stamp
    6464
    65 update-externals: .Externals-stamp
     65update-externals: .Dependencies-stamp
    6666        cd $(srcdir); svn update
    6767
     
    7171
    7272if HAVE_EXTERNALS
    73 EXTRA_DIST += Externals
    74 DISTCLEANFILES += .Externals-stamp
     73EXTRA_DIST += Dependencies
     74DISTCLEANFILES += .Dependencies-stamp
    7575endif
    7676
  • stable/0.6/coin.m4

    r2103 r2112  
    15371537AC_DEFUN([AC_COIN_INIT_AUTOMAKE],
    15381538[AC_REQUIRE([AC_PROG_EGREP])
     1539AC_REQUIRE([AC_PROG_LN_S])
    15391540
    15401541# AC_MSG_NOTICE([Beginning automake initialisation.])
     
    16701671                     [AC_MSG_ERROR([I cannot find the libtool.m4 file.])])
    16711672
    1672   # Check if we have an Externals file
    1673   if test -r $srcdir/Externals; then
     1673  # Check if we have an Dependencies file
     1674  if test -r $srcdir/Dependencies; then
    16741675    coin_have_externals=yes
    16751676  fi
     
    17011702        BUILDTOOLSDIR=$srcdir/../../BuildTools
    17021703      else
    1703         AC_MSG_ERROR(Cannot find the BuildTools directory)
     1704        AC_MSG_ERROR(Cannot find the BuildTools directory, better disable maintainer mode.)
    17041705      fi
    17051706    fi
    17061707  fi
    17071708  AC_SUBST(BUILDTOOLSDIR)
     1709 
     1710  # for running automake by make, we need to have Makemain.inc available at the place where it usually can be found during run_autotools
     1711  if test "$BUILDTOOLSDIR" != "$srcdir/BuildTools" ; then
     1712    $LN_S `cd $BUILDTOOLSDIR; pwd` "$srcdir/BuildTools"
     1713  fi
    17081714
    17091715  # The following variable is set to the name of the directory where
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.