Changeset 2006


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

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/Lapack/trunk
Files:
4 edited

Legend:

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

    r1954 r2006  
    99EXTRA_DIST = get.lapack INSTALL.LAPACK
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinlapack.la
     11lib_LTLIBRARIES = libcoinlapack.la
    1312
    1413LAPACK_FILES = \
  • ThirdParty/Lapack/trunk/Makefile.in

    r1954 r2006  
    7575  esac;
    7676am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    77 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    78         "$(DESTDIR)$(pkgconfiglibdir)"
    79 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    80 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     77am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"
     78libLTLIBRARIES_INSTALL = $(INSTALL)
     79LTLIBRARIES = $(lib_LTLIBRARIES)
    8180libcoinlapack_la_LIBADD =
    8281am__objects_1 = dbdsqr.lo dgebd2.lo dgebrd.lo dgelq2.lo dgelqf.lo \
     
    266265AUTOMAKE_OPTIONS = foreign
    267266EXTRA_DIST = get.lapack INSTALL.LAPACK $(am__append_1)
    268 thirdpartylibdir = $(libdir)/coin/ThirdParty
    269 thirdpartylib_LTLIBRARIES = libcoinlapack.la
     267lib_LTLIBRARIES = libcoinlapack.la
    270268LAPACK_FILES = \
    271269        dbdsqr.f \
     
    397395coinlapack-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinlapack-uninstalled.pc.in
    398396        cd $(top_builddir) && $(SHELL) ./config.status $@
    399 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     397install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    400398        @$(NORMAL_INSTALL)
    401         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    402         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     399        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     400        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    403401          if test -f $$p; then \
    404402            f=$(am__strip_dir) \
    405             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    406             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     403            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     404            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    407405          else :; fi; \
    408406        done
    409407
    410 uninstall-thirdpartylibLTLIBRARIES:
     408uninstall-libLTLIBRARIES:
    411409        @$(NORMAL_UNINSTALL)
    412         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     410        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    413411          p=$(am__strip_dir) \
    414           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    415           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     412          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     413          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    416414        done
    417415
    418 clean-thirdpartylibLTLIBRARIES:
    419         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    420         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     416clean-libLTLIBRARIES:
     417        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     418        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    421419          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    422420          test "$$dir" != "$$p" || dir=.; \
     
    425423        done
    426424libcoinlapack.la: $(libcoinlapack_la_OBJECTS) $(libcoinlapack_la_DEPENDENCIES)
    427         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinlapack_la_LDFLAGS) $(libcoinlapack_la_OBJECTS) $(libcoinlapack_la_LIBADD) $(LIBS)
     425        $(F77LINK) -rpath $(libdir) $(libcoinlapack_la_LDFLAGS) $(libcoinlapack_la_OBJECTS) $(libcoinlapack_la_LIBADD) $(LIBS)
    428426
    429427mostlyclean-compile:
     
    648646all-am: Makefile $(LTLIBRARIES) $(DATA)
    649647installdirs:
    650         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     648        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    651649          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    652650        done
     
    681679clean: clean-am
    682680
    683 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     681clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    684682        mostlyclean-am
    685683
     
    700698info-am:
    701699
    702 install-data-am: install-pkgconfiglibDATA \
    703         install-thirdpartylibLTLIBRARIES
     700install-data-am: install-pkgconfiglibDATA
    704701        @$(NORMAL_INSTALL)
    705702        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    706703
    707 install-exec-am:
     704install-exec-am: install-libLTLIBRARIES
    708705
    709706install-info: install-info-am
     
    732729ps-am:
    733730
    734 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    735         uninstall-thirdpartylibLTLIBRARIES
     731uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     732        uninstall-pkgconfiglibDATA
    736733        @$(NORMAL_INSTALL)
    737734        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    738735
    739736.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    740         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    741         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    742         dist-zip distcheck distclean distclean-compile \
    743         distclean-generic distclean-libtool distclean-tags \
    744         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    745         html-am info info-am install install-am install-data \
    746         install-data-am install-data-hook install-exec install-exec-am \
    747         install-info install-info-am install-man \
    748         install-pkgconfiglibDATA install-strip \
    749         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    750         installdirs maintainer-clean maintainer-clean-generic \
    751         mostlyclean mostlyclean-compile mostlyclean-generic \
    752         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    753         uninstall-am uninstall-hook uninstall-info-am \
    754         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     737        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     738        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     739        distcheck distclean distclean-compile distclean-generic \
     740        distclean-libtool distclean-tags distcleancheck distdir \
     741        distuninstallcheck dvi dvi-am html html-am info info-am \
     742        install install-am install-data install-data-am \
     743        install-data-hook install-exec install-exec-am install-info \
     744        install-info-am install-libLTLIBRARIES install-man \
     745        install-pkgconfiglibDATA install-strip installcheck \
     746        installcheck-am installdirs maintainer-clean \
     747        maintainer-clean-generic mostlyclean mostlyclean-compile \
     748        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     749        tags uninstall uninstall-am uninstall-hook uninstall-info-am \
     750        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
    755751
    756752
  • ThirdParty/Lapack/trunk/coinlapack.pc.in

    r1680 r2006  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44
    55Name: Lapack
  • ThirdParty/Lapack/trunk/configure

    r1954 r2006  
    60666066full_prefix=`cd $full_prefix ; pwd`
    60676067
    6068 abs_lib_dir=$full_prefix/lib/coin
     6068abs_lib_dir=$full_prefix/lib
    60696069
    60706070abs_include_dir=$full_prefix/include
     
    2154821548      if test "$GXX" = "yes"; then
    2154921549        RPATH_FLAGS=
    21550         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21550        for dir in $abs_lib_dir; do
    2155121551          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2155221552        done
     
    2156521565    *-*-solaris*)
    2156621566        RPATH_FLAGS=
    21567         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21567        for dir in $abs_lib_dir; do
    2156821568          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2156921569        done
Note: See TracChangeset for help on using the changeset viewer.