Changeset 1469 for ThirdParty/Metis


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

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

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

Legend:

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

    r1436 r1469  
    99EXTRA_DIST = get.metis INSTALL.METIS
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
    1212thirdpartylib_LTLIBRARIES = libcoinmetis.la
    1313
     
    8484  $(METISDIR)/Lib/struct.h
    8585
    86 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Metis
     86addlibsdir = $(datadir)/coin/doc/ThirdParty/Metis
    8787addlibs_DATA = README metis_addlibs.txt
    8888
    89 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    90 pkgconfiglib_DATA = metis.pc
     89pkgconfiglibdir = $(libdir)/pkgconfig
     90pkgconfiglib_DATA = coinmetis.pc
    9191
    9292# Suppress default defines from autoheader
  • ThirdParty/Metis/branches/BSPsplit/Makefile.in

    r1446 r1469  
    5959        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    6060        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    61         $(srcdir)/metis-uninstalled.pc.in $(srcdir)/metis.pc.in \
    62         $(srcdir)/metis_addlibs.txt.in $(thirdpartyinclude_HEADERS) \
    63         $(top_srcdir)/configure
     61        $(srcdir)/coinmetis-uninstalled.pc.in \
     62        $(srcdir)/coinmetis.pc.in $(srcdir)/metis_addlibs.txt.in \
     63        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
    6464@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6565@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    7373 configure.lineno configure.status.lineno
    7474mkinstalldirs = $(install_sh) -d
    75 CONFIG_CLEAN_FILES = metis_addlibs.txt metis.pc metis-uninstalled.pc
     75CONFIG_CLEAN_FILES = metis_addlibs.txt coinmetis.pc \
     76        coinmetis-uninstalled.pc
    7677am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7778am__vpath_adj = case $$p in \
     
    261262AUTOMAKE_OPTIONS = foreign
    262263EXTRA_DIST = get.metis INSTALL.METIS $(am__append_1)
    263 thirdpartylibdir = $(prefix)/lib/ThirdParty
     264thirdpartylibdir = $(libdir)/coin/ThirdParty
    264265thirdpartylib_LTLIBRARIES = libcoinmetis.la
    265266libcoinmetis_la_SOURCES = \
     
    331332  $(METISDIR)/Lib/struct.h
    332333
    333 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Metis
     334addlibsdir = $(datadir)/coin/doc/ThirdParty/Metis
    334335addlibs_DATA = README metis_addlibs.txt
    335 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    336 pkgconfiglib_DATA = metis.pc
     336pkgconfiglibdir = $(libdir)/pkgconfig
     337pkgconfiglib_DATA = coinmetis.pc
    337338
    338339########################################################################
     
    384385metis_addlibs.txt: $(top_builddir)/config.status $(srcdir)/metis_addlibs.txt.in
    385386        cd $(top_builddir) && $(SHELL) ./config.status $@
    386 metis.pc: $(top_builddir)/config.status $(srcdir)/metis.pc.in
     387coinmetis.pc: $(top_builddir)/config.status $(srcdir)/coinmetis.pc.in
    387388        cd $(top_builddir) && $(SHELL) ./config.status $@
    388 metis-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/metis-uninstalled.pc.in
     389coinmetis-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinmetis-uninstalled.pc.in
    389390        cd $(top_builddir) && $(SHELL) ./config.status $@
    390391install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
  • ThirdParty/Metis/branches/BSPsplit/coinmetis.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: Metis
  • ThirdParty/Metis/branches/BSPsplit/configure

    r1446 r1469  
    1992219922
    1992319923
    19924                                         ac_config_files="$ac_config_files Makefile metis_addlibs.txt metis.pc metis-uninstalled.pc"
     19924                                        ac_config_files="$ac_config_files Makefile metis_addlibs.txt coinmetis.pc coinmetis-uninstalled.pc"
    1992519925
    1992619926
     
    2059720597  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2059820598  "metis_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES metis_addlibs.txt" ;;
    20599   "metis.pc" ) CONFIG_FILES="$CONFIG_FILES metis.pc" ;;
    20600   "metis-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES metis-uninstalled.pc" ;;
     20599  "coinmetis.pc" ) CONFIG_FILES="$CONFIG_FILES coinmetis.pc" ;;
     20600  "coinmetis-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES coinmetis-uninstalled.pc" ;;
    2060120601  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2060220602  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/Metis/branches/BSPsplit/configure.ac

    r1446 r1469  
    7070AC_SUBST(METISDIR)
    7171
    72 AC_CONFIG_FILES([Makefile metis_addlibs.txt metis.pc metis-uninstalled.pc])
     72AC_CONFIG_FILES([Makefile metis_addlibs.txt coinmetis.pc coinmetis-uninstalled.pc])
    7373
    7474AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.