Changeset 1469 for ThirdParty/Glpk


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

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

Location:
ThirdParty/Glpk/branches/BSPsplit
Files:
4 edited
2 moved

Legend:

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

    r1396 r1469  
    99EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
    1212thirdpartylib_LTLIBRARIES = libcoinglpk.la
    1313
     
    170170thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
    171171
    172 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
     172addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
    173173addlibs_DATA = glpk_addlibs.txt README
    174174
    175 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    176 pkgconfiglib_DATA = glpk.pc
     175pkgconfiglibdir = $(libdir)/pkgconfig
     176pkgconfiglib_DATA = coinglpk.pc
    177177
    178178########################################################################
  • 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)
  • ThirdParty/Glpk/branches/BSPsplit/coinglpk.pc.in

    r1463 r1469  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib/ThirdParty
    3 includedir=${prefix}/include/coin/ThirdParty
     2exec_prefix=@exec_prefix@
     3libdir=@libdir@/coin/ThirdParty
     4includedir=@includedir@/coin/ThirdParty
    45
    56Name: Glpk
  • ThirdParty/Glpk/branches/BSPsplit/configure

    r1446 r1469  
    2189321893
    2189421894
    21895                                         ac_config_files="$ac_config_files Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc"
     21895                                        ac_config_files="$ac_config_files Makefile glpk_addlibs.txt coinglpk.pc coinglpk-uninstalled.pc"
    2189621896
    2189721897          ac_config_headers="$ac_config_headers config_glpk.h"
     
    2255122551  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2255222552  "glpk_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES glpk_addlibs.txt" ;;
    22553   "glpk.pc" ) CONFIG_FILES="$CONFIG_FILES glpk.pc" ;;
    22554   "glpk-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES glpk-uninstalled.pc" ;;
     22553  "coinglpk.pc" ) CONFIG_FILES="$CONFIG_FILES coinglpk.pc" ;;
     22554  "coinglpk-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinglpk-uninstalled.pc" ;;
    2255522555  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2255622556  "config_glpk.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config_glpk.h" ;;
  • ThirdParty/Glpk/branches/BSPsplit/configure.ac

    r1446 r1469  
    245245AC_SUBST(GLPKDIR)
    246246
    247 AC_CONFIG_FILES([Makefile glpk_addlibs.txt glpk.pc glpk-uninstalled.pc])
     247AC_CONFIG_FILES([Makefile glpk_addlibs.txt coinglpk.pc coinglpk-uninstalled.pc])
    248248AC_CONFIG_HEADER([config_glpk.h])
    249249
Note: See TracChangeset for help on using the changeset viewer.