Changeset 1559 for trunk/Clp/Makefile.am


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/Makefile.am

    r1162 r1559  
    8989        if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    9090
     91install-exec-local: install-doc
     92
     93uninstall-local: uninstall-doc
     94
    9195.PHONY: test unitTest
    9296
     
    9599########################################################################
    96100
    97 addlibsfile = clp_addlibs.txt
    98 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
     101if COIN_HAS_PKGCONFIG
     102addlibsdir = $(datadir)/coin/doc/Clp
     103addlibs_DATA = clp_addlibs.txt
    99104
    100 install-exec-local: install-doc
    101         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     105clp_addlibs.txt : clp.pc
     106        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs clp > clp_addlibs.txt
     107endif
    102108
    103 uninstall-local: uninstall-doc
    104         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     109pkgconfiglibdir = $(libdir)/pkgconfig
     110pkgconfiglib_DATA = clp.pc
    105111
    106112########################################################################
     
    108114########################################################################
    109115
     116CLEANFILES = clp_addlibs.txt
     117
    110118# Files that are generated and should be cleaned with make distclean
    111119DISTCLEANFILES =
Note: See TracChangeset for help on using the changeset viewer.