Ignore:
Timestamp:
Aug 14, 2011 6:45:31 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1781 from trunk

Location:
stable/1.14
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1781
  • stable/1.14/Clp/src

  • stable/1.14/Clp/src/OsiClp/Makefile.am

    r1753 r1782  
    2424# Here list all include flags, relative to this "srcdir" directory.  This
    2525# "cygpath" stuff is necessary to compile with native compilers on Windows.
    26 # "top_srcdir" refers to the basic directory for the main package that is
    27 # being compiled.
    28 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \
    29         -I`$(CYGPATH_W) $(srcdir)/..`
     26AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS)
    3027
    3128# This line is necessary to allow VPATH compilation
     
    3734
    3835# Here list all the header files that are required by a user of the library,
    39 # and that therefore should be installed in 'includedir/coin'
     36# and that therefore should be installed in 'include/coin'
    4037includecoindir = $(includedir)/coin
    4138includecoin_HEADERS = OsiClpSolverInterface.hpp
Note: See TracChangeset for help on using the changeset viewer.