Changeset 2007


Ignore:
Timestamp:
Dec 26, 2010 10:57:15 AM (9 years ago)
Author:
stefan
Message:

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/Metis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/trunk/Makefile.am

    r1955 r2007  
    99EXTRA_DIST = get.metis INSTALL.METIS
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinmetis.la
     11lib_LTLIBRARIES = libcoinmetis.la
    1312
    1413METISDIR = @METISDIR@
  • ThirdParty/Metis/trunk/Makefile.in

    r1955 r2007  
    7777  esac;
    7878am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    79 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    80         "$(DESTDIR)$(pkgconfiglibdir)" \
     79am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
    8180        "$(DESTDIR)$(thirdpartyincludedir)"
    82 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    83 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     81libLTLIBRARIES_INSTALL = $(INSTALL)
     82LTLIBRARIES = $(lib_LTLIBRARIES)
    8483libcoinmetis_la_LIBADD =
    8584am_libcoinmetis_la_OBJECTS = balance.lo bucketsort.lo ccgraph.lo \
     
    268267AUTOMAKE_OPTIONS = foreign
    269268EXTRA_DIST = get.metis INSTALL.METIS $(am__append_1)
    270 thirdpartylibdir = $(libdir)/coin/ThirdParty
    271 thirdpartylib_LTLIBRARIES = libcoinmetis.la
     269lib_LTLIBRARIES = libcoinmetis.la
    272270libcoinmetis_la_SOURCES = \
    273271        $(METISDIR)/Lib/balance.c \
     
    393391coinmetis-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinmetis-uninstalled.pc.in
    394392        cd $(top_builddir) && $(SHELL) ./config.status $@
    395 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     393install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    396394        @$(NORMAL_INSTALL)
    397         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    398         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     395        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     396        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    399397          if test -f $$p; then \
    400398            f=$(am__strip_dir) \
    401             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    402             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     399            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     400            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    403401          else :; fi; \
    404402        done
    405403
    406 uninstall-thirdpartylibLTLIBRARIES:
     404uninstall-libLTLIBRARIES:
    407405        @$(NORMAL_UNINSTALL)
    408         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     406        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    409407          p=$(am__strip_dir) \
    410           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    411           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     408          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     409          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    412410        done
    413411
    414 clean-thirdpartylibLTLIBRARIES:
    415         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    416         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     412clean-libLTLIBRARIES:
     413        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     414        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    417415          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    418416          test "$$dir" != "$$p" || dir=.; \
     
    421419        done
    422420libcoinmetis.la: $(libcoinmetis_la_OBJECTS) $(libcoinmetis_la_DEPENDENCIES)
    423         $(LINK) -rpath $(thirdpartylibdir) $(libcoinmetis_la_LDFLAGS) $(libcoinmetis_la_OBJECTS) $(libcoinmetis_la_LIBADD) $(LIBS)
     421        $(LINK) -rpath $(libdir) $(libcoinmetis_la_LDFLAGS) $(libcoinmetis_la_OBJECTS) $(libcoinmetis_la_LIBADD) $(LIBS)
    424422
    425423mostlyclean-compile:
     
    10901088all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
    10911089installdirs:
    1092         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     1090        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    10931091          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    10941092        done
     
    11231121clean: clean-am
    11241122
    1125 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     1123clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    11261124        mostlyclean-am
    11271125
     
    11441142
    11451143install-data-am: install-pkgconfiglibDATA \
    1146         install-thirdpartyincludeHEADERS \
    1147         install-thirdpartylibLTLIBRARIES
     1144        install-thirdpartyincludeHEADERS
    11481145        @$(NORMAL_INSTALL)
    11491146        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    11501147
    1151 install-exec-am:
     1148install-exec-am: install-libLTLIBRARIES
    11521149
    11531150install-info: install-info-am
     
    11771174ps-am:
    11781175
    1179 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    1180         uninstall-thirdpartyincludeHEADERS \
    1181         uninstall-thirdpartylibLTLIBRARIES
     1176uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     1177        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    11821178        @$(NORMAL_INSTALL)
    11831179        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    11841180
    11851181.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    1186         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    1187         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    1188         dist-zip distcheck distclean distclean-compile \
    1189         distclean-generic distclean-libtool distclean-tags \
    1190         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    1191         html-am info info-am install install-am install-data \
    1192         install-data-am install-data-hook install-exec install-exec-am \
    1193         install-info install-info-am install-man \
     1182        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     1183        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     1184        distcheck distclean distclean-compile distclean-generic \
     1185        distclean-libtool distclean-tags distcleancheck distdir \
     1186        distuninstallcheck dvi dvi-am html html-am info info-am \
     1187        install install-am install-data install-data-am \
     1188        install-data-hook install-exec install-exec-am install-info \
     1189        install-info-am install-libLTLIBRARIES install-man \
    11941190        install-pkgconfiglibDATA install-strip \
    1195         install-thirdpartyincludeHEADERS \
    1196         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
     1191        install-thirdpartyincludeHEADERS installcheck installcheck-am \
    11971192        installdirs maintainer-clean maintainer-clean-generic \
    11981193        mostlyclean mostlyclean-compile mostlyclean-generic \
    11991194        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    12001195        uninstall-am uninstall-hook uninstall-info-am \
    1201         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    1202         uninstall-thirdpartylibLTLIBRARIES
     1196        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
     1197        uninstall-thirdpartyincludeHEADERS
    12031198
    12041199
  • ThirdParty/Metis/trunk/coinmetis.pc.in

    r1685 r2007  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44includedir=@includedir@/coin/ThirdParty
    55
  • ThirdParty/Metis/trunk/configure

    r1955 r2007  
    44284428full_prefix=`cd $full_prefix ; pwd`
    44294429
    4430 abs_lib_dir=$full_prefix/lib/coin
     4430abs_lib_dir=$full_prefix/lib
    44314431
    44324432abs_include_dir=$full_prefix/include
     
    1999519995      if test "$GXX" = "yes"; then
    1999619996        RPATH_FLAGS=
    19997         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     19997        for dir in $abs_lib_dir; do
    1999819998          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    1999919999        done
     
    2001220012    *-*-solaris*)
    2001320013        RPATH_FLAGS=
    20014         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     20014        for dir in $abs_lib_dir; do
    2001520015          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2001620016        done
Note: See TracChangeset for help on using the changeset viewer.