Changeset 1469 for ThirdParty/Blas


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/Blas/branches/BSPsplit
Files:
4 edited
2 moved

Legend:

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

    r1396 r1469  
    99EXTRA_DIST = get.blas INSTALL.BLAS
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
    1212thirdpartylib_LTLIBRARIES = libcoinblas.la
    1313
     
    5353libcoinblas_la_LDFLAGS = $(LT_LDFLAGS)
    5454
    55 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Blas
     55addlibsdir = $(datadir)/coin/doc/ThirdParty/Blas
    5656addlibs_DATA = blas_addlibs.txt README
    5757
    58 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    59 pkgconfiglib_DATA = blas.pc
     58pkgconfiglibdir = $(libdir)/pkgconfig
     59pkgconfiglib_DATA = coinblas.pc
    6060
    6161########################################################################
  • ThirdParty/Blas/branches/BSPsplit/Makefile.in

    r1460 r1469  
    5757        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5858        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/blas-uninstalled.pc.in \
    60         $(srcdir)/blas.pc.in $(srcdir)/blas_addlibs.txt.in \
     59        $(srcdir)/Makefile.in $(srcdir)/blas_addlibs.txt.in \
     60        $(srcdir)/coinblas-uninstalled.pc.in $(srcdir)/coinblas.pc.in \
    6161        $(top_srcdir)/configure
    6262@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
     
    7171 configure.lineno configure.status.lineno
    7272mkinstalldirs = $(install_sh) -d
    73 CONFIG_CLEAN_FILES = blas_addlibs.txt blas.pc blas-uninstalled.pc
     73CONFIG_CLEAN_FILES = blas_addlibs.txt coinblas.pc \
     74        coinblas-uninstalled.pc
    7475am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7576am__vpath_adj = case $$p in \
     
    250251AUTOMAKE_OPTIONS = foreign
    251252EXTRA_DIST = get.blas INSTALL.BLAS $(am__append_1)
    252 thirdpartylibdir = $(prefix)/lib/ThirdParty
     253thirdpartylibdir = $(libdir)/coin/ThirdParty
    253254thirdpartylib_LTLIBRARIES = libcoinblas.la
    254255libcoinblas_la_SOURCES = \
     
    292293
    293294libcoinblas_la_LDFLAGS = $(LT_LDFLAGS)
    294 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Blas
     295addlibsdir = $(datadir)/coin/doc/ThirdParty/Blas
    295296addlibs_DATA = blas_addlibs.txt README
    296 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    297 pkgconfiglib_DATA = blas.pc
     297pkgconfiglibdir = $(libdir)/pkgconfig
     298pkgconfiglib_DATA = coinblas.pc
    298299
    299300########################################################################
     
    344345blas_addlibs.txt: $(top_builddir)/config.status $(srcdir)/blas_addlibs.txt.in
    345346        cd $(top_builddir) && $(SHELL) ./config.status $@
    346 blas.pc: $(top_builddir)/config.status $(srcdir)/blas.pc.in
     347coinblas.pc: $(top_builddir)/config.status $(srcdir)/coinblas.pc.in
    347348        cd $(top_builddir) && $(SHELL) ./config.status $@
    348 blas-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/blas-uninstalled.pc.in
     349coinblas-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinblas-uninstalled.pc.in
    349350        cd $(top_builddir) && $(SHELL) ./config.status $@
    350351install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
  • ThirdParty/Blas/branches/BSPsplit/coinblas.pc.in

    r1463 r1469  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib/ThirdParty
     2exec_prefix=@exec_prefix@
     3libdir=@libdir@/coin/ThirdParty
    34
    45Name: Blas
  • ThirdParty/Blas/branches/BSPsplit/configure

    r1460 r1469  
    2131921319}
    2132021320
    21321                                         ac_config_files="$ac_config_files Makefile blas_addlibs.txt blas.pc blas-uninstalled.pc"
     21321                                        ac_config_files="$ac_config_files Makefile blas_addlibs.txt coinblas.pc coinblas-uninstalled.pc"
    2132221322
    2132321323
     
    2199421994  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2199521995  "blas_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES blas_addlibs.txt" ;;
    21996   "blas.pc" ) CONFIG_FILES="$CONFIG_FILES blas.pc" ;;
    21997   "blas-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES blas-uninstalled.pc" ;;
     21996  "coinblas.pc" ) CONFIG_FILES="$CONFIG_FILES coinblas.pc" ;;
     21997  "coinblas-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinblas-uninstalled.pc" ;;
    2199821998  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2199921999  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/Blas/branches/BSPsplit/configure.ac

    r1460 r1469  
    5959AC_COIN_INIT_AUTO_TOOLS
    6060
    61 AC_CONFIG_FILES([Makefile blas_addlibs.txt blas.pc blas-uninstalled.pc])
     61AC_CONFIG_FILES([Makefile blas_addlibs.txt coinblas.pc coinblas-uninstalled.pc])
    6262
    6363AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.