Ignore:
Timestamp:
Feb 6, 2010 3:12:35 PM (11 years ago)
Author:
stefan
Message:

add prefix coin to .pc files; changed install dir for libs and doc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/BSPsplit/Makefile.in

    r1446 r1469  
    5959        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    6060        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    61         $(srcdir)/config_glpk.h.in $(srcdir)/glpk-uninstalled.pc.in \
    62         $(srcdir)/glpk.pc.in $(srcdir)/glpk_addlibs.txt.in \
     61        $(srcdir)/coinglpk-uninstalled.pc.in $(srcdir)/coinglpk.pc.in \
     62        $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
    6363        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
    6464@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
     
    7474mkinstalldirs = $(install_sh) -d
    7575CONFIG_HEADER = config_glpk.h
    76 CONFIG_CLEAN_FILES = glpk_addlibs.txt glpk.pc glpk-uninstalled.pc
     76CONFIG_CLEAN_FILES = glpk_addlibs.txt coinglpk.pc \
     77        coinglpk-uninstalled.pc
    7778am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7879am__vpath_adj = case $$p in \
     
    275276AUTOMAKE_OPTIONS = foreign
    276277EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch $(am__append_1)
    277 thirdpartylibdir = $(prefix)/lib/ThirdParty
     278thirdpartylibdir = $(libdir)/coin/ThirdParty
    278279thirdpartylib_LTLIBRARIES = libcoinglpk.la
    279280libcoinglpk_la_SOURCES = \
     
    410411thirdpartyincludedir = $(includedir)/coin/ThirdParty
    411412thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
    412 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
     413addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
    413414addlibs_DATA = glpk_addlibs.txt README
    414 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    415 pkgconfiglib_DATA = glpk.pc
     415pkgconfiglibdir = $(libdir)/pkgconfig
     416pkgconfiglib_DATA = coinglpk.pc
    416417
    417418########################################################################
     
    480481glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
    481482        cd $(top_builddir) && $(SHELL) ./config.status $@
    482 glpk.pc: $(top_builddir)/config.status $(srcdir)/glpk.pc.in
     483coinglpk.pc: $(top_builddir)/config.status $(srcdir)/coinglpk.pc.in
    483484        cd $(top_builddir) && $(SHELL) ./config.status $@
    484 glpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/glpk-uninstalled.pc.in
     485coinglpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinglpk-uninstalled.pc.in
    485486        cd $(top_builddir) && $(SHELL) ./config.status $@
    486487install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
Note: See TracChangeset for help on using the changeset viewer.