Changeset 1464 for trunk/Makefile.in


Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/Makefile.in

    r871 r1464  
    9090distuninstallcheck_listfiles = find . -type f -print
    9191distcleancheck_listfiles = find . -type f -print
     92ABSBUILDDIR = @ABSBUILDDIR@
    9293ACLOCAL = @ACLOCAL@
    9394ADD_CFLAGS = @ADD_CFLAGS@
     
    108109CDEFS = @CDEFS@
    109110CFLAGS = @CFLAGS@
     111COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     112COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     113COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    110114COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    111115CPP = @CPP@
     
    163167PACKAGE_VERSION = @PACKAGE_VERSION@
    164168PATH_SEPARATOR = @PATH_SEPARATOR@
     169PKG_CONFIG = @PKG_CONFIG@
    165170RANLIB = @RANLIB@
    166171RPATH_FLAGS = @RPATH_FLAGS@
     
    182187ac_ct_STRIP = @ac_ct_STRIP@
    183188ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     189ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    184190am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    185191am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    242248DISTCLEANFILES = $(am__append_2) $(VPATH_DISTCLEANFILES)
    243249DocFiles = README AUTHORS LICENSE
    244 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     250DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    245251all: all-recursive
    246252
Note: See TracChangeset for help on using the changeset viewer.