Changeset 2004 for ThirdParty/Glpk


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

change library installation directory to libdir; rerun autotools

Location:
ThirdParty/Glpk/trunk
Files:
4 edited

Legend:

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

    r1983 r2004  
    99EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
    1010
    11 thirdpartylibdir = $(libdir)/coin/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinglpk.la
     11lib_LTLIBRARIES = libcoinglpk.la
    1312
    1413GLPKDIR = @GLPKDIR@
  • ThirdParty/Glpk/trunk/Makefile.in

    r1983 r2004  
    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
     
    7878  esac;
    7979am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    80 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    81         "$(DESTDIR)$(pkgconfiglibdir)" \
     80am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
    8281        "$(DESTDIR)$(thirdpartyincludedir)"
    83 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    84 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     82libLTLIBRARIES_INSTALL = $(INSTALL)
     83LTLIBRARIES = $(lib_LTLIBRARIES)
    8584libcoinglpk_la_LIBADD =
    8685am_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
     
    284283AUTOMAKE_OPTIONS = foreign
    285284EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch $(am__append_1)
    286 thirdpartylibdir = $(libdir)/coin/ThirdParty
    287 thirdpartylib_LTLIBRARIES = libcoinglpk.la
     285lib_LTLIBRARIES = libcoinglpk.la
    288286libcoinglpk_la_SOURCES = \
    289287$(GLPKDIR)/src/glpapi01.c \
     
    478476coinglpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/coinglpk-uninstalled.pc.in
    479477        cd $(top_builddir) && $(SHELL) ./config.status $@
    480 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     478install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    481479        @$(NORMAL_INSTALL)
    482         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    483         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     480        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     481        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    484482          if test -f $$p; then \
    485483            f=$(am__strip_dir) \
    486             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    487             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     484            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     485            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    488486          else :; fi; \
    489487        done
    490488
    491 uninstall-thirdpartylibLTLIBRARIES:
     489uninstall-libLTLIBRARIES:
    492490        @$(NORMAL_UNINSTALL)
    493         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     491        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    494492          p=$(am__strip_dir) \
    495           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    496           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     493          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     494          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    497495        done
    498496
    499 clean-thirdpartylibLTLIBRARIES:
    500         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    501         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     497clean-libLTLIBRARIES:
     498        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     499        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    502500          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    503501          test "$$dir" != "$$p" || dir=.; \
     
    506504        done
    507505libcoinglpk.la: $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_DEPENDENCIES)
    508         $(LINK) -rpath $(thirdpartylibdir) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
     506        $(LINK) -rpath $(libdir) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
    509507
    510508mostlyclean-compile:
     
    16231621all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config_glpk.h
    16241622installdirs:
    1625         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     1623        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    16261624          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    16271625        done
     
    16561654clean: clean-am
    16571655
    1658 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     1656clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    16591657        mostlyclean-am
    16601658
     
    16771675
    16781676install-data-am: install-pkgconfiglibDATA \
    1679         install-thirdpartyincludeHEADERS \
    1680         install-thirdpartylibLTLIBRARIES
     1677        install-thirdpartyincludeHEADERS
    16811678        @$(NORMAL_INSTALL)
    16821679        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    16831680
    1684 install-exec-am:
     1681install-exec-am: install-libLTLIBRARIES
    16851682
    16861683install-info: install-info-am
     
    17101707ps-am:
    17111708
    1712 uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA \
    1713         uninstall-thirdpartyincludeHEADERS \
    1714         uninstall-thirdpartylibLTLIBRARIES
     1709uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     1710        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    17151711        @$(NORMAL_INSTALL)
    17161712        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    17171713
    17181714.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    1719         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    1720         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    1721         dist-zip distcheck distclean distclean-compile \
    1722         distclean-generic distclean-hdr distclean-libtool \
    1723         distclean-tags distcleancheck distdir distuninstallcheck dvi \
    1724         dvi-am html html-am info info-am install install-am \
    1725         install-data install-data-am install-data-hook install-exec \
    1726         install-exec-am install-info install-info-am install-man \
     1715        clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
     1716        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     1717        distcheck distclean distclean-compile distclean-generic \
     1718        distclean-hdr distclean-libtool distclean-tags distcleancheck \
     1719        distdir distuninstallcheck dvi dvi-am html html-am info \
     1720        info-am install install-am install-data install-data-am \
     1721        install-data-hook install-exec install-exec-am install-info \
     1722        install-info-am install-libLTLIBRARIES install-man \
    17271723        install-pkgconfiglibDATA install-strip \
    1728         install-thirdpartyincludeHEADERS \
    1729         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
     1724        install-thirdpartyincludeHEADERS installcheck installcheck-am \
    17301725        installdirs maintainer-clean maintainer-clean-generic \
    17311726        mostlyclean mostlyclean-compile mostlyclean-generic \
    17321727        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    17331728        uninstall-am uninstall-hook uninstall-info-am \
    1734         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    1735         uninstall-thirdpartylibLTLIBRARIES
     1729        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
     1730        uninstall-thirdpartyincludeHEADERS
    17361731
    17371732
  • ThirdParty/Glpk/trunk/coinglpk.pc.in

    r1681 r2004  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin/ThirdParty
     3libdir=@libdir@
    44includedir=@includedir@/coin/ThirdParty
    55
  • ThirdParty/Glpk/trunk/configure

    r1983 r2004  
    44304430full_prefix=`cd $full_prefix ; pwd`
    44314431
    4432 abs_lib_dir=$full_prefix/lib/coin
     4432abs_lib_dir=$full_prefix/lib
    44334433
    44344434abs_include_dir=$full_prefix/include
     
    1999719997      if test "$GXX" = "yes"; then
    1999819998        RPATH_FLAGS=
    19999         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     19999        for dir in $abs_lib_dir; do
    2000020000          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2000120001        done
     
    2001420014    *-*-solaris*)
    2001520015        RPATH_FLAGS=
    20016         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     20016        for dir in $abs_lib_dir; do
    2001720017          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2001820018        done
Note: See TracChangeset for help on using the changeset viewer.