Ignore:
Timestamp:
Dec 19, 2010 12:25:22 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1648, except for half of chgset1635 and except for chgset1643

Location:
stable/1.13/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.13/Clp

  • stable/1.13/Clp/Makefile.am

    r1582 r1649  
    111111pkgconfiglib_DATA = clp.pc
    112112
    113 if COIN_HAS_PKGCONFIG
     113if COIN_HAS_OSI
     114pkgconfiglib_DATA += osi-clp.pc
     115endif
     116
    114117addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    115118       
    116119install-data-hook:
    117120        @$(mkdir_p) "$(addlibsdir)"
     121if COIN_HAS_PKGCONFIG
    118122        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    119123        $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
     124else
     125        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
     126endif
    120127
    121128uninstall-hook:
    122129        rm -f $(addlibsdir)/clp_addlibs.txt
    123 endif
    124130
    125131########################################################################
Note: See TracChangeset for help on using the changeset viewer.