Changeset 1659 for trunk


Ignore:
Timestamp:
Jan 2, 2011 9:33:56 AM (9 years ago)
Author:
stefan
Message:

change library installation directory back to

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/clp.pc.in

    r1657 r1659  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55

  • trunk/Clp/src/Makefile.am

    r1655 r1659  
    1818
    1919# Name of the library compiled in this directory.  We want it to be installed
    20 # in the 'lib/coin' directory
    21 coinlibdir = ${libdir}/coin
    22 coinlib_LTLIBRARIES = libClp.la
     20# in the 'lib' directory
     21lib_LTLIBRARIES = libClp.la
    2322
    2423# List all source files for this library, including headers
    … …  
    105104# library is found (in the lib install directory) when we are using dynamic
    106105# libraries.
    107 clp_LDFLAGS = -rpath $(coinlibdir)
     106clp_LDFLAGS = -rpath $(libdir)
    108107
    109108########################################################################

  • trunk/Clp/src/Makefile.in

    r1657 r1659  
    6363  esac;
    6464am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    65 am__installdirs = "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" \
     65am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    6666        "$(DESTDIR)$(includecoindir)"
    67 coinlibLTLIBRARIES_INSTALL = $(INSTALL)
    68 LTLIBRARIES = $(coinlib_LTLIBRARIES)
     67libLTLIBRARIES_INSTALL = $(INSTALL)
     68LTLIBRARIES = $(lib_LTLIBRARIES)
    6969libClp_la_LIBADD =
    7070am_libClp_la_OBJECTS = ClpCholeskyBase.lo ClpCholeskyDense.lo \
    … …  
    342342
    343343# Name of the library compiled in this directory.  We want it to be installed
    344 # in the 'lib/coin' directory
    345 coinlibdir = ${libdir}/coin
    346 coinlib_LTLIBRARIES = libClp.la
     344# in the 'lib' directory
     345lib_LTLIBRARIES = libClp.la
    347346
    348347# List all source files for this library, including headers
    … …  
    423422# library is found (in the lib install directory) when we are using dynamic
    424423# libraries.
    425 clp_LDFLAGS = -rpath $(coinlibdir)
     424clp_LDFLAGS = -rpath $(libdir)
    426425
    427426########################################################################
    … …  
    503502$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    504503        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    505 install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
     504install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    506505        @$(NORMAL_INSTALL)
    507         test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
    508         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     506        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     507        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    509508          if test -f $$p; then \
    510509            f=$(am__strip_dir) \
    511             echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
    512             $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
     510            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     511            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    513512          else :; fi; \
    514513        done
    515514
    516 uninstall-coinlibLTLIBRARIES:
     515uninstall-libLTLIBRARIES:
    517516        @$(NORMAL_UNINSTALL)
    518         @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     517        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    519518          p=$(am__strip_dir) \
    520           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
    521           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
    522         done
    523 
    524 clean-coinlibLTLIBRARIES:
    525         -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
    526         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     519          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     520          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     521        done
     522
     523clean-libLTLIBRARIES:
     524        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     525        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    527526          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    528527          test "$$dir" != "$$p" || dir=.; \
    … …  
    531530        done
    532531libClp.la: $(libClp_la_OBJECTS) $(libClp_la_DEPENDENCIES)
    533         $(CXXLINK) -rpath $(coinlibdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)
     532        $(CXXLINK) -rpath $(libdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)
    534533install-binPROGRAMS: $(bin_PROGRAMS)
    535534        @$(NORMAL_INSTALL)
    … …  
    852851check: check-recursive
    853852all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
     853install-binPROGRAMS: install-libLTLIBRARIES
     854
    854855installdirs: installdirs-recursive
    855856installdirs-am:
    856         for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
     857        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    857858          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    858859        done
    … …  
    883884clean: clean-recursive
    884885
    885 clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     886clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    886887        clean-libtool mostlyclean-am
    887888
    … …  
    902903info-am:
    903904
    904 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
    905 
    906 install-exec-am: install-binPROGRAMS install-exec-local
     905install-data-am: install-includecoinHEADERS
     906
     907install-exec-am: install-binPROGRAMS install-exec-local \
     908        install-libLTLIBRARIES
    907909
    908910install-info: install-info-recursive
    … …  
    930932ps-am:
    931933
    932 uninstall-am: uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
    933         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     934uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
     935        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    934936
    935937uninstall-info: uninstall-info-recursive
    936938
    937939.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    938         clean clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     940        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    939941        clean-libtool clean-recursive ctags ctags-recursive distclean \
    940942        distclean-compile distclean-generic distclean-libtool \
    941943        distclean-recursive distclean-tags distdir dvi dvi-am html \
    942944        html-am info info-am install install-am install-binPROGRAMS \
    943         install-coinlibLTLIBRARIES install-data install-data-am \
    944         install-exec install-exec-am install-exec-local \
    945         install-includecoinHEADERS install-info install-info-am \
    946         install-man install-strip installcheck installcheck-am \
    947         installdirs installdirs-am maintainer-clean \
    948         maintainer-clean-generic maintainer-clean-recursive \
    949         mostlyclean mostlyclean-compile mostlyclean-generic \
    950         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    951         tags tags-recursive uninstall uninstall-am \
    952         uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
    953         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     945        install-data install-data-am install-exec install-exec-am \
     946        install-exec-local install-includecoinHEADERS install-info \
     947        install-info-am install-libLTLIBRARIES install-man \
     948        install-strip installcheck installcheck-am installdirs \
     949        installdirs-am maintainer-clean maintainer-clean-generic \
     950        maintainer-clean-recursive mostlyclean mostlyclean-compile \
     951        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
     952        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
     953        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
     954        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    954955
    955956

  • trunk/Clp/src/OsiClp/Makefile.am

    r1655 r1659  
    1414
    1515# Name of the library compiled in this directory.
    16 coinlibdir = ${libdir}/coin
    17 coinlib_LTLIBRARIES = libOsiClp.la
     16lib_LTLIBRARIES = libOsiClp.la
    1817
    1918# List all source files for this library, including headers

  • trunk/Clp/src/OsiClp/Makefile.in

    r1657 r1659  
    6161  esac;
    6262am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    63 am__installdirs = "$(DESTDIR)$(coinlibdir)" \
    64         "$(DESTDIR)$(includecoindir)"
    65 coinlibLTLIBRARIES_INSTALL = $(INSTALL)
    66 LTLIBRARIES = $(coinlib_LTLIBRARIES)
     63am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
     64libLTLIBRARIES_INSTALL = $(INSTALL)
     65LTLIBRARIES = $(lib_LTLIBRARIES)
    6766libOsiClp_la_LIBADD =
    6867am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
    … …  
    308307
    309308# Name of the library compiled in this directory.
    310 coinlibdir = ${libdir}/coin
    311 coinlib_LTLIBRARIES = libOsiClp.la
     309lib_LTLIBRARIES = libOsiClp.la
    312310
    313311# List all source files for this library, including headers
    … …  
    370368$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    371369        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    372 install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
     370install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    373371        @$(NORMAL_INSTALL)
    374         test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
    375         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     372        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     373        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    376374          if test -f $$p; then \
    377375            f=$(am__strip_dir) \
    378             echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
    379             $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
     376            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     377            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    380378          else :; fi; \
    381379        done
    382380
    383 uninstall-coinlibLTLIBRARIES:
     381uninstall-libLTLIBRARIES:
    384382        @$(NORMAL_UNINSTALL)
    385         @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     383        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    386384          p=$(am__strip_dir) \
    387           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
    388           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
     385          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     386          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    389387        done
    390388
    391 clean-coinlibLTLIBRARIES:
    392         -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
    393         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     389clean-libLTLIBRARIES:
     390        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     391        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    394392          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    395393          test "$$dir" != "$$p" || dir=.; \
    … …  
    398396        done
    399397libOsiClp.la: $(libOsiClp_la_OBJECTS) $(libOsiClp_la_DEPENDENCIES)
    400         $(CXXLINK) -rpath $(coinlibdir) $(libOsiClp_la_LDFLAGS) $(libOsiClp_la_OBJECTS) $(libOsiClp_la_LIBADD) $(LIBS)
     398        $(CXXLINK) -rpath $(libdir) $(libOsiClp_la_LDFLAGS) $(libOsiClp_la_OBJECTS) $(libOsiClp_la_LIBADD) $(LIBS)
    401399
    402400mostlyclean-compile:
    … …  
    535533all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    536534installdirs:
    537         for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \
     535        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
    538536          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    539537        done
    … …  
    564562clean: clean-am
    565563
    566 clean-am: clean-coinlibLTLIBRARIES clean-generic clean-libtool \
     564clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    567565        mostlyclean-am
    568566
    … …  
    583581info-am:
    584582
    585 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
    586 
    587 install-exec-am:
     583install-data-am: install-includecoinHEADERS
     584
     585install-exec-am: install-libLTLIBRARIES
    588586
    589587install-info: install-info-am
    … …  
    611609ps-am:
    612610
    613 uninstall-am: uninstall-coinlibLTLIBRARIES \
    614         uninstall-includecoinHEADERS uninstall-info-am
    615 
    616 .PHONY: CTAGS GTAGS all all-am check check-am clean \
    617         clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
    618         distclean distclean-compile distclean-generic \
    619         distclean-libtool distclean-tags distdir dvi dvi-am html \
    620         html-am info info-am install install-am \
    621         install-coinlibLTLIBRARIES install-data install-data-am \
    622         install-exec install-exec-am install-includecoinHEADERS \
    623         install-info install-info-am install-man install-strip \
    624         installcheck installcheck-am installdirs maintainer-clean \
    625         maintainer-clean-generic mostlyclean mostlyclean-compile \
    626         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    627         tags uninstall uninstall-am uninstall-coinlibLTLIBRARIES \
    628         uninstall-includecoinHEADERS uninstall-info-am
     611uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
     612        uninstall-libLTLIBRARIES
     613
     614.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     615        clean-libLTLIBRARIES clean-libtool ctags distclean \
     616        distclean-compile distclean-generic distclean-libtool \
     617        distclean-tags distdir dvi dvi-am html html-am info info-am \
     618        install install-am install-data install-data-am install-exec \
     619        install-exec-am install-includecoinHEADERS install-info \
     620        install-info-am install-libLTLIBRARIES install-man \
     621        install-strip installcheck installcheck-am installdirs \
     622        maintainer-clean maintainer-clean-generic mostlyclean \
     623        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     624        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     625        uninstall-includecoinHEADERS uninstall-info-am \
     626        uninstall-libLTLIBRARIES
    629627
    630628# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • trunk/Clp/src/OsiClp/osi-clp.pc.in

    r1657 r1659  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55
Note: See TracChangeset for help on using the changeset viewer.