Changeset 2008


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

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
4 edited

Legend:

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

    r1956 r2008  
    99EXTRA_DIST = get.mumps INSTALL.MUMPS
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinmumps.la
     11lib_LTLIBRARIES = libcoinmumps.la
    1312
    1413MUMPSDIR = @MUMPSDIR@
  • ThirdParty/Mumps/trunk/Makefile.in

    r1956 r2008  
    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)
    8483libcoinmumps_la_LIBADD =
    8584nodist_libcoinmumps_la_OBJECTS = tools_common_mod.lo \
     
    311310AUTOMAKE_OPTIONS = foreign
    312311EXTRA_DIST = get.mumps INSTALL.MUMPS $(am__append_1)
    313 thirdpartylibdir = $(libdir)/coin/ThirdParty
    314 thirdpartylib_LTLIBRARIES = libcoinmumps.la
     312lib_LTLIBRARIES = libcoinmumps.la
    315313nodist_libcoinmumps_la_SOURCES = \
    316314        $(MUMPSDIR)/src/tools_common_mod.F \
     
    414412coinmumps-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinmumps-uninstalled.pc.in
    415413        cd $(top_builddir) && $(SHELL) ./config.status $@
    416 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     414install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    417415        @$(NORMAL_INSTALL)
    418         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    419         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     416        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     417        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    420418          if test -f $$p; then \
    421419            f=$(am__strip_dir) \
    422             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    423             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     420            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     421            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    424422          else :; fi; \
    425423        done
    426424
    427 uninstall-thirdpartylibLTLIBRARIES:
     425uninstall-libLTLIBRARIES:
    428426        @$(NORMAL_UNINSTALL)
    429         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     427        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    430428          p=$(am__strip_dir) \
    431           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    432           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     429          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     430          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    433431        done
    434432
    435 clean-thirdpartylibLTLIBRARIES:
    436         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    437         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     433clean-libLTLIBRARIES:
     434        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     435        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    438436          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    439437          test "$$dir" != "$$p" || dir=.; \
     
    442440        done
    443441libcoinmumps.la: $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_DEPENDENCIES)
    444         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
     442        $(F77LINK) -rpath $(libdir) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
    445443
    446444mostlyclean-compile:
     
    849847all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
    850848installdirs:
    851         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     849        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    852850          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    853851        done
     
    882880clean: clean-am
    883881
    884 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     882clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    885883        mostlyclean-am
    886884
     
    903901
    904902install-data-am: install-pkgconfiglibDATA \
    905         install-thirdpartyincludeHEADERS \
    906         install-thirdpartylibLTLIBRARIES
     903        install-thirdpartyincludeHEADERS
    907904        @$(NORMAL_INSTALL)
    908905        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    909906
    910 install-exec-am:
     907install-exec-am: install-libLTLIBRARIES
    911908
    912909install-info: install-info-am
     
    936933ps-am:
    937934
    938 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    939         uninstall-thirdpartyincludeHEADERS \
    940         uninstall-thirdpartylibLTLIBRARIES
     935uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     936        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    941937        @$(NORMAL_INSTALL)
    942938        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    943939
    944940.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    945         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    946         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    947         dist-zip distcheck distclean distclean-compile \
    948         distclean-generic distclean-libtool distclean-tags \
    949         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    950         html-am info info-am install install-am install-data \
    951         install-data-am install-data-hook install-exec install-exec-am \
    952         install-info install-info-am install-man \
     941        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     942        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     943        distcheck distclean distclean-compile distclean-generic \
     944        distclean-libtool distclean-tags distcleancheck distdir \
     945        distuninstallcheck dvi dvi-am html html-am info info-am \
     946        install install-am install-data install-data-am \
     947        install-data-hook install-exec install-exec-am install-info \
     948        install-info-am install-libLTLIBRARIES install-man \
    953949        install-pkgconfiglibDATA install-strip \
    954         install-thirdpartyincludeHEADERS \
    955         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
     950        install-thirdpartyincludeHEADERS installcheck installcheck-am \
    956951        installdirs maintainer-clean maintainer-clean-generic \
    957952        mostlyclean mostlyclean-compile mostlyclean-generic \
    958953        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    959954        uninstall-am uninstall-hook uninstall-info-am \
    960         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    961         uninstall-thirdpartylibLTLIBRARIES
     955        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
     956        uninstall-thirdpartyincludeHEADERS
    962957
    963958
  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r1684 r2008  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44includedir=@includedir@/coin/ThirdParty
    55
  • ThirdParty/Mumps/trunk/configure

    r1956 r2008  
    65186518full_prefix=`cd $full_prefix ; pwd`
    65196519
    6520 abs_lib_dir=$full_prefix/lib/coin
     6520abs_lib_dir=$full_prefix/lib
    65216521
    65226522abs_include_dir=$full_prefix/include
     
    2151921519      if test "$GXX" = "yes"; then
    2152021520        RPATH_FLAGS=
    21521         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21521        for dir in $abs_lib_dir; do
    2152221522          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2152321523        done
     
    2153621536    *-*-solaris*)
    2153721537        RPATH_FLAGS=
    21538         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21538        for dir in $abs_lib_dir; do
    2153921539          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2154021540        done
Note: See TracChangeset for help on using the changeset viewer.