Ignore:
Timestamp:
Dec 19, 2010 1:42:04 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1551, except for chgsets 1539,1540

Location:
stable/2.6/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.6/Cbc

  • stable/2.6/Cbc/Makefile.am

    r1492 r1553  
    129129pkgconfiglib_DATA = cbc.pc osi-cbc.pc
    130130
    131 if COIN_HAS_PKGCONFIG
    132131addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    133132       
    134133install-data-hook:
    135134        @$(mkdir_p) "$(addlibsdir)"
     135if COIN_HAS_PKGCONFIG
    136136        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    137137        $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
     138else
     139        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     140endif
    138141
    139142uninstall-hook:
    140143        rm -f $(addlibsdir)/cbc_addlibs.txt
    141 endif
    142144
    143145########################################################################
Note: See TracChangeset for help on using the changeset viewer.