Changeset 1559 for trunk/Makefile.in


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (10 years ago)
Author:
stefan
Message:

merge split branch into trunk

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.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Makefile.in

    r1165 r1559  
    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.