Changeset 2132 for stable/2.9


Ignore:
Timestamp:
Feb 7, 2015 2:56:19 PM (5 years ago)
Author:
tkr
Message:

Patching Makefile.am for DESTDIR

Location:
stable/2.9/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc/Makefile.am

    r1990 r2132  
    137137        @$(mkdir_p) "$(addlibsdir)"
    138138if COIN_HAS_PKGCONFIG
    139         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
     139        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
    140140        $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    141141else
  • stable/2.9/Cbc/Makefile.in

    r1991 r2132  
    981981install-data-hook:
    982982        @$(mkdir_p) "$(addlibsdir)"
    983 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
     983@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
    984984@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    985985@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
Note: See TracChangeset for help on using the changeset viewer.