Changeset 2005


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

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/HSL/trunk
Files:
4 edited

Legend:

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

    r1953 r2005  
    99EXTRA_DIST = INSTALL.HSL
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinhsl.la
     11lib_LTLIBRARIES = libcoinhsl.la
    1312
    1413libcoinhsl_la_SOURCES = dummy.c
  • ThirdParty/HSL/trunk/Makefile.in

    r1953 r2005  
    8383  esac;
    8484am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    85 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    86         "$(DESTDIR)$(pkgconfiglibdir)"
    87 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    88 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     85am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"
     86libLTLIBRARIES_INSTALL = $(INSTALL)
     87LTLIBRARIES = $(lib_LTLIBRARIES)
    8988libcoinhsl_la_LIBADD =
    9089am__libcoinhsl_la_SOURCES_DIST = dummy.c ma27ad.f ma57ad.f mc19ad.f \
     
    327326AUTOMAKE_OPTIONS = foreign
    328327EXTRA_DIST = INSTALL.HSL $(am__append_6)
    329 thirdpartylibdir = $(libdir)/coin/ThirdParty
    330 thirdpartylib_LTLIBRARIES = libcoinhsl.la
     328lib_LTLIBRARIES = libcoinhsl.la
    331329libcoinhsl_la_SOURCES = dummy.c $(am__append_1) $(am__append_2) \
    332330        $(am__append_3) $(am__append_4) $(am__append_5)
     
    408406coinhsl-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinhsl-uninstalled.pc.in
    409407        cd $(top_builddir) && $(SHELL) ./config.status $@
    410 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     408install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    411409        @$(NORMAL_INSTALL)
    412         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    413         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     410        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     411        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    414412          if test -f $$p; then \
    415413            f=$(am__strip_dir) \
    416             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    417             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     414            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     415            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    418416          else :; fi; \
    419417        done
    420418
    421 uninstall-thirdpartylibLTLIBRARIES:
     419uninstall-libLTLIBRARIES:
    422420        @$(NORMAL_UNINSTALL)
    423         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     421        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    424422          p=$(am__strip_dir) \
    425           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    426           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     423          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     424          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    427425        done
    428426
    429 clean-thirdpartylibLTLIBRARIES:
    430         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    431         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     427clean-libLTLIBRARIES:
     428        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     429        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    432430          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    433431          test "$$dir" != "$$p" || dir=.; \
     
    436434        done
    437435libcoinhsl.la: $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_DEPENDENCIES)
    438         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinhsl_la_LDFLAGS) $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_LIBADD) $(LIBS)
     436        $(F77LINK) -rpath $(libdir) $(libcoinhsl_la_LDFLAGS) $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_LIBADD) $(LIBS)
    439437
    440438mostlyclean-compile:
     
    691689all-am: Makefile $(LTLIBRARIES) $(DATA) config_hsl.h
    692690installdirs:
    693         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     691        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    694692          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    695693        done
     
    726724clean: clean-am
    727725
    728 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     726clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    729727        mostlyclean-am
    730728
     
    746744info-am:
    747745
    748 install-data-am: install-pkgconfiglibDATA \
    749         install-thirdpartylibLTLIBRARIES
     746install-data-am: install-pkgconfiglibDATA
    750747        @$(NORMAL_INSTALL)
    751748        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    752749
    753 install-exec-am: install-exec-local
     750install-exec-am: install-exec-local install-libLTLIBRARIES
    754751
    755752install-info: install-info-am
     
    779776ps-am:
    780777
    781 uninstall-am: uninstall-info-am uninstall-local \
    782         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     778uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     779        uninstall-local uninstall-pkgconfiglibDATA
    783780        @$(NORMAL_INSTALL)
    784781        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    785782
    786783.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    787         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    788         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    789         dist-zip distcheck distclean distclean-compile \
    790         distclean-generic distclean-hdr distclean-libtool \
    791         distclean-tags distcleancheck distdir distuninstallcheck dvi \
    792         dvi-am html html-am info info-am install install-am \
    793         install-data install-data-am install-data-hook install-exec \
    794         install-exec-am install-exec-local install-info \
    795         install-info-am install-man install-pkgconfiglibDATA \
    796         install-strip install-thirdpartylibLTLIBRARIES installcheck \
    797         installcheck-am installdirs maintainer-clean \
    798         maintainer-clean-generic mostlyclean mostlyclean-compile \
    799         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    800         tags uninstall uninstall-am uninstall-hook uninstall-info-am \
    801         uninstall-local uninstall-pkgconfiglibDATA \
    802         uninstall-thirdpartylibLTLIBRARIES
     784        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     785        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     786        distcheck distclean distclean-compile distclean-generic \
     787        distclean-hdr distclean-libtool distclean-tags distcleancheck \
     788        distdir distuninstallcheck dvi dvi-am html html-am info \
     789        info-am install install-am install-data install-data-am \
     790        install-data-hook install-exec install-exec-am \
     791        install-exec-local install-info install-info-am \
     792        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     793        install-strip installcheck installcheck-am installdirs \
     794        maintainer-clean maintainer-clean-generic mostlyclean \
     795        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     796        pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
     797        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local \
     798        uninstall-pkgconfiglibDATA
    803799
    804800
  • ThirdParty/HSL/trunk/coinhsl.pc.in

    r1873 r2005  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44
    55Name: HSL
  • ThirdParty/HSL/trunk/configure

    r1953 r2005  
    63036303full_prefix=`cd $full_prefix ; pwd`
    63046304
    6305 abs_lib_dir=$full_prefix/lib/coin
     6305abs_lib_dir=$full_prefix/lib
    63066306
    63076307abs_include_dir=$full_prefix/include
     
    2178521785      if test "$GXX" = "yes"; then
    2178621786        RPATH_FLAGS=
    21787         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21787        for dir in $abs_lib_dir; do
    2178821788          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2178921789        done
     
    2180221802    *-*-solaris*)
    2180321803        RPATH_FLAGS=
    21804         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     21804        for dir in $abs_lib_dir; do
    2180521805          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2180621806        done
Note: See TracChangeset for help on using the changeset viewer.