Changeset 2003


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

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/FilterSQP/trunk
Files:
4 edited

Legend:

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

    r1984 r2003  
    99EXTRA_DIST =
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libfiltersqp.la
     11lib_LTLIBRARIES = libfiltersqp.la
    1312
    1413libfiltersqp_la_SOURCES = \
  • ThirdParty/FilterSQP/trunk/Makefile.in

    r1984 r2003  
    2121# Copyright (C) 2006, 2007 International Business Machines and others.
    2222# All Rights Reserved.
    23 # This file is distributed under the Common Public License.
     23# This file is distributed under the Eclipse Public License.
    2424
    2525# Author:  Andreas Waechter           IBM    2006-04-13
     
    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)
    8180libfiltersqp_la_LIBADD =
    8281am_libfiltersqp_la_OBJECTS = auxil.lo bqpd.lo filteraux.lo filter.lo \
     
    254253AUTOMAKE_OPTIONS = foreign
    255254EXTRA_DIST = $(am__append_1)
    256 thirdpartylibdir = $(libdir)/coin/ThirdParty
    257 thirdpartylib_LTLIBRARIES = libfiltersqp.la
     255lib_LTLIBRARIES = libfiltersqp.la
    258256libfiltersqp_la_SOURCES = \
    259257        source/src/auxil.f \
     
    323321coinfiltersqp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinfiltersqp-uninstalled.pc.in
    324322        cd $(top_builddir) && $(SHELL) ./config.status $@
    325 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     323install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    326324        @$(NORMAL_INSTALL)
    327         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    328         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     325        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     326        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    329327          if test -f $$p; then \
    330328            f=$(am__strip_dir) \
    331             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    332             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     329            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     330            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    333331          else :; fi; \
    334332        done
    335333
    336 uninstall-thirdpartylibLTLIBRARIES:
     334uninstall-libLTLIBRARIES:
    337335        @$(NORMAL_UNINSTALL)
    338         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     336        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    339337          p=$(am__strip_dir) \
    340           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    341           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    342         done
    343 
    344 clean-thirdpartylibLTLIBRARIES:
    345         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    346         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     338          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     339          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     340        done
     341
     342clean-libLTLIBRARIES:
     343        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     344        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    347345          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    348346          test "$$dir" != "$$p" || dir=.; \
     
    351349        done
    352350libfiltersqp.la: $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_DEPENDENCIES)
    353         $(F77LINK) -rpath $(thirdpartylibdir) $(libfiltersqp_la_LDFLAGS) $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_LIBADD) $(LIBS)
     351        $(F77LINK) -rpath $(libdir) $(libfiltersqp_la_LDFLAGS) $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_LIBADD) $(LIBS)
    354352
    355353mostlyclean-compile:
     
    604602all-am: Makefile $(LTLIBRARIES) $(DATA)
    605603installdirs:
    606         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     604        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    607605          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    608606        done
     
    637635clean: clean-am
    638636
    639 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     637clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    640638        mostlyclean-am
    641639
     
    656654info-am:
    657655
    658 install-data-am: install-pkgconfiglibDATA \
    659         install-thirdpartylibLTLIBRARIES
     656install-data-am: install-pkgconfiglibDATA
    660657        @$(NORMAL_INSTALL)
    661658        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    662659
    663 install-exec-am:
     660install-exec-am: install-libLTLIBRARIES
    664661
    665662install-info: install-info-am
     
    688685ps-am:
    689686
    690 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    691         uninstall-thirdpartylibLTLIBRARIES
     687uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     688        uninstall-pkgconfiglibDATA
    692689        @$(NORMAL_INSTALL)
    693690        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    694691
    695692.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    696         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    697         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    698         dist-zip distcheck distclean distclean-compile \
    699         distclean-generic distclean-libtool distclean-tags \
    700         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    701         html-am info info-am install install-am install-data \
    702         install-data-am install-data-hook install-exec install-exec-am \
    703         install-info install-info-am install-man \
    704         install-pkgconfiglibDATA install-strip \
    705         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    706         installdirs maintainer-clean maintainer-clean-generic \
    707         mostlyclean mostlyclean-compile mostlyclean-generic \
    708         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    709         uninstall-am uninstall-hook uninstall-info-am \
    710         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     693        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     694        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     695        distcheck distclean distclean-compile distclean-generic \
     696        distclean-libtool distclean-tags distcleancheck distdir \
     697        distuninstallcheck dvi dvi-am html html-am info info-am \
     698        install install-am install-data install-data-am \
     699        install-data-hook install-exec install-exec-am install-info \
     700        install-info-am install-libLTLIBRARIES install-man \
     701        install-pkgconfiglibDATA install-strip installcheck \
     702        installcheck-am installdirs maintainer-clean \
     703        maintainer-clean-generic mostlyclean mostlyclean-compile \
     704        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     705        tags uninstall uninstall-am uninstall-hook uninstall-info-am \
     706        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA
    711707
    712708
  • ThirdParty/FilterSQP/trunk/coinfiltersqp.pc.in

    r1682 r2003  
    11prefix=@prefix@
    2 libdir=@exec_prefix@/lib/ThirdParty
     2libdir=@exec_prefix@/lib
    33
    44Name: FilterSQP
  • ThirdParty/FilterSQP/trunk/configure

    r1984 r2003  
    59545954full_prefix=`cd $full_prefix ; pwd`
    59555955
    5956 abs_lib_dir=$full_prefix/lib/coin
     5956abs_lib_dir=$full_prefix/lib
    59575957
    59585958abs_include_dir=$full_prefix/include
     
    66826682full_prefix=`cd $full_prefix ; pwd`
    66836683
    6684 abs_lib_dir=$full_prefix/lib/coin
     6684abs_lib_dir=$full_prefix/lib
    66856685
    66866686abs_include_dir=$full_prefix/include
     
    2227322273      if test "$GXX" = "yes"; then
    2227422274        RPATH_FLAGS=
    22275         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     22275        for dir in $abs_lib_dir; do
    2227622276          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2227722277        done
     
    2229022290    *-*-solaris*)
    2229122291        RPATH_FLAGS=
    22292         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     22292        for dir in $abs_lib_dir; do
    2229322293          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2229422294        done
Note: See TracChangeset for help on using the changeset viewer.