Changeset 1469 for ThirdParty/FilterSQP


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

Legend:

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

    r1454 r1469  
    99EXTRA_DIST =
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
    1212thirdpartylib_LTLIBRARIES = libfiltersqp.la
    1313
     
    2626libfiltersqp_la_LDFLAGS = $(LT_LDFLAGS)
    2727
    28 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/FilterSQP
     28addlibsdir = $(datadir)/coin/doc/ThirdParty/FilterSQP
    2929addlibs_DATA = filtersqp_addlibs.txt README
    3030
    31 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    32 pkgconfiglib_DATA = filtersqp.pc
     31pkgconfiglibdir = $(libdir)/pkgconfig
     32pkgconfiglib_DATA = coinfiltersqp.pc
    3333
    3434########################################################################
  • ThirdParty/FilterSQP/branches/BSPsplit/Makefile.in

    r1460 r1469  
    5757        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5858        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/filtersqp-uninstalled.pc.in \
    60         $(srcdir)/filtersqp.pc.in $(srcdir)/filtersqp_addlibs.txt.in \
    61         $(top_srcdir)/configure
     59        $(srcdir)/Makefile.in \
     60        $(srcdir)/coinfiltersqp-uninstalled.pc.in \
     61        $(srcdir)/coinfiltersqp.pc.in \
     62        $(srcdir)/filtersqp_addlibs.txt.in $(top_srcdir)/configure
    6263@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6364@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    7172 configure.lineno configure.status.lineno
    7273mkinstalldirs = $(install_sh) -d
    73 CONFIG_CLEAN_FILES = filtersqp_addlibs.txt filtersqp.pc \
    74         filtersqp-uninstalled.pc
     74CONFIG_CLEAN_FILES = filtersqp_addlibs.txt coinfiltersqp.pc \
     75        coinfiltersqp-uninstalled.pc
    7576am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7677am__vpath_adj = case $$p in \
     
    247248AUTOMAKE_OPTIONS = foreign
    248249EXTRA_DIST = $(am__append_1)
    249 thirdpartylibdir = $(prefix)/lib/ThirdParty
     250thirdpartylibdir = $(libdir)/coin/ThirdParty
    250251thirdpartylib_LTLIBRARIES = libfiltersqp.la
    251252libfiltersqp_la_SOURCES = \
     
    262263
    263264libfiltersqp_la_LDFLAGS = $(LT_LDFLAGS)
    264 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/FilterSQP
     265addlibsdir = $(datadir)/coin/doc/ThirdParty/FilterSQP
    265266addlibs_DATA = filtersqp_addlibs.txt README
    266 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    267 pkgconfiglib_DATA = filtersqp.pc
     267pkgconfiglibdir = $(libdir)/pkgconfig
     268pkgconfiglib_DATA = coinfiltersqp.pc
    268269
    269270########################################################################
     
    314315filtersqp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/filtersqp_addlibs.txt.in
    315316        cd $(top_builddir) && $(SHELL) ./config.status $@
    316 filtersqp.pc: $(top_builddir)/config.status $(srcdir)/filtersqp.pc.in
     317coinfiltersqp.pc: $(top_builddir)/config.status $(srcdir)/coinfiltersqp.pc.in
    317318        cd $(top_builddir) && $(SHELL) ./config.status $@
    318 filtersqp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/filtersqp-uninstalled.pc.in
     319coinfiltersqp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinfiltersqp-uninstalled.pc.in
    319320        cd $(top_builddir) && $(SHELL) ./config.status $@
    320321install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
  • ThirdParty/FilterSQP/branches/BSPsplit/configure

    r1460 r1469  
    2208322083}
    2208422084
    22085                                         ac_config_files="$ac_config_files Makefile filtersqp_addlibs.txt filtersqp.pc filtersqp-uninstalled.pc"
     22085                                        ac_config_files="$ac_config_files Makefile filtersqp_addlibs.txt coinfiltersqp.pc coinfiltersqp-uninstalled.pc"
    2208622086
    2208722087
     
    2278622786  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2278722787  "filtersqp_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES filtersqp_addlibs.txt" ;;
    22788   "filtersqp.pc" ) CONFIG_FILES="$CONFIG_FILES filtersqp.pc" ;;
    22789   "filtersqp-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES filtersqp-uninstalled.pc" ;;
     22788  "coinfiltersqp.pc" ) CONFIG_FILES="$CONFIG_FILES coinfiltersqp.pc" ;;
     22789  "coinfiltersqp-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinfiltersqp-uninstalled.pc" ;;
    2279022790  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2279122791  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/FilterSQP/branches/BSPsplit/configure.ac

    r1460 r1469  
    5858AC_COIN_INIT_AUTO_TOOLS
    5959
    60 AC_CONFIG_FILES([Makefile filtersqp_addlibs.txt filtersqp.pc filtersqp-uninstalled.pc])
     60AC_CONFIG_FILES([Makefile filtersqp_addlibs.txt coinfiltersqp.pc coinfiltersqp-uninstalled.pc])
    6161
    6262AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.