Changeset 2107


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

Patching Makefile.am for DESTDIR

Location:
stable/1.16/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp/Makefile.am

    r1996 r2107  
    125125        @$(mkdir_p) "$(addlibsdir)"
    126126if COIN_HAS_PKGCONFIG
    127         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
     127        PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
    128128        $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    129129else
  • stable/1.16/Clp/Makefile.in

    r2036 r2107  
    918918install-data-hook:
    919919        @$(mkdir_p) "$(addlibsdir)"
    920 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
     920@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
    921921@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    922922@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
Note: See TracChangeset for help on using the changeset viewer.