Changeset 1568


Ignore:
Timestamp:
Jan 2, 2011 10:05:27 AM (8 years ago)
Author:
stefan
Message:

change library installation directory back to

Location:
trunk/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cbc/cbc.pc.in

    r1566 r1568  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55

  • trunk/Cbc/osi-cbc.pc.in

    r1566 r1568  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55

  • trunk/Cbc/src/Makefile.am

    r1565 r1568  
    1717# Name of the library compiled in this directory.  We want it to be installed
    1818# in the 'lib' directory
    19 coinlibdir = ${libdir}/coin
    20 coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
     19lib_LTLIBRARIES = libCbc.la libCbcSolver.la
    2120
    2221# List all source files for this library, including headers

  • trunk/Cbc/src/Makefile.in

    r1566 r1568  
    8484  esac;
    8585am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    86 am__installdirs = "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" \
     86am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    8787        "$(DESTDIR)$(includecoindir)"
    88 coinlibLTLIBRARIES_INSTALL = $(INSTALL)
    89 LTLIBRARIES = $(coinlib_LTLIBRARIES)
     88libLTLIBRARIES_INSTALL = $(INSTALL)
     89LTLIBRARIES = $(lib_LTLIBRARIES)
    9090libCbc_la_LIBADD =
    9191am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
    … …  
    512512# Name of the library compiled in this directory.  We want it to be installed
    513513# in the 'lib' directory
    514 coinlibdir = ${libdir}/coin
    515 coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
     514lib_LTLIBRARIES = libCbc.la libCbcSolver.la
    516515
    517516# List all source files for this library, including headers
    … …  
    770769$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    771770        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    772 install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
     771install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    773772        @$(NORMAL_INSTALL)
    774         test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
    775         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     773        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     774        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    776775          if test -f $$p; then \
    777776            f=$(am__strip_dir) \
    778             echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
    779             $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
     777            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     778            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    780779          else :; fi; \
    781780        done
    782781
    783 uninstall-coinlibLTLIBRARIES:
     782uninstall-libLTLIBRARIES:
    784783        @$(NORMAL_UNINSTALL)
    785         @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     784        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    786785          p=$(am__strip_dir) \
    787           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
    788           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
     786          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     787          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    789788        done
    790789
    791 clean-coinlibLTLIBRARIES:
    792         -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
    793         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     790clean-libLTLIBRARIES:
     791        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     792        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    794793          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    795794          test "$$dir" != "$$p" || dir=.; \
    … …  
    798797        done
    799798libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES)
    800         $(CXXLINK) -rpath $(coinlibdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
     799        $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
    801800libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES)
    802         $(CXXLINK) -rpath $(coinlibdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
     801        $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
    803802install-binPROGRAMS: $(bin_PROGRAMS)
    804803        @$(NORMAL_INSTALL)
    … …  
    11541153check: check-recursive
    11551154all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
     1155install-binPROGRAMS: install-libLTLIBRARIES
     1156
    11561157installdirs: installdirs-recursive
    11571158installdirs-am:
    1158         for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
     1159        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11591160          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11601161        done
    … …  
    11851186clean: clean-recursive
    11861187
    1187 clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     1188clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    11881189        clean-libtool mostlyclean-am
    11891190
    … …  
    12041205info-am:
    12051206
    1206 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
    1207 
    1208 install-exec-am: install-binPROGRAMS install-exec-local
     1207install-data-am: install-includecoinHEADERS
     1208
     1209install-exec-am: install-binPROGRAMS install-exec-local \
     1210        install-libLTLIBRARIES
    12091211
    12101212install-info: install-info-recursive
    … …  
    12321234ps-am:
    12331235
    1234 uninstall-am: uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
    1235         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     1236uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
     1237        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12361238
    12371239uninstall-info: uninstall-info-recursive
    12381240
    12391241.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1240         clean clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
     1242        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    12411243        clean-libtool clean-recursive ctags ctags-recursive distclean \
    12421244        distclean-compile distclean-generic distclean-libtool \
    12431245        distclean-recursive distclean-tags distdir dvi dvi-am html \
    12441246        html-am info info-am install install-am install-binPROGRAMS \
    1245         install-coinlibLTLIBRARIES install-data install-data-am \
    1246         install-exec install-exec-am install-exec-local \
    1247         install-includecoinHEADERS install-info install-info-am \
    1248         install-man install-strip installcheck installcheck-am \
    1249         installdirs installdirs-am maintainer-clean \
    1250         maintainer-clean-generic maintainer-clean-recursive \
    1251         mostlyclean mostlyclean-compile mostlyclean-generic \
    1252         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    1253         tags tags-recursive uninstall uninstall-am \
    1254         uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
    1255         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     1247        install-data install-data-am install-exec install-exec-am \
     1248        install-exec-local install-includecoinHEADERS install-info \
     1249        install-info-am install-libLTLIBRARIES install-man \
     1250        install-strip installcheck installcheck-am installdirs \
     1251        installdirs-am maintainer-clean maintainer-clean-generic \
     1252        maintainer-clean-recursive mostlyclean mostlyclean-compile \
     1253        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
     1254        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
     1255        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
     1256        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12561257
    12571258

  • trunk/Cbc/src/OsiCbc/Makefile.am

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

  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1566 r1568  
    7171  esac;
    7272am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    73 am__installdirs = "$(DESTDIR)$(coinlibdir)" \
    74         "$(DESTDIR)$(includecoindir)"
    75 coinlibLTLIBRARIES_INSTALL = $(INSTALL)
    76 LTLIBRARIES = $(coinlib_LTLIBRARIES)
     73am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
     74libLTLIBRARIES_INSTALL = $(INSTALL)
     75LTLIBRARIES = $(lib_LTLIBRARIES)
    7776libOsiCbc_la_LIBADD =
    7877am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
    … …  
    430429
    431430# Name of the library compiled in this directory.
    432 coinlibdir = ${libdir}/coin
    433 coinlib_LTLIBRARIES = libOsiCbc.la
     431lib_LTLIBRARIES = libOsiCbc.la
    434432
    435433# List all source files for this library, including headers
    … …  
    495493$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    496494        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    497 install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
     495install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    498496        @$(NORMAL_INSTALL)
    499         test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
    500         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     497        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     498        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    501499          if test -f $$p; then \
    502500            f=$(am__strip_dir) \
    503             echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
    504             $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
     501            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     502            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    505503          else :; fi; \
    506504        done
    507505
    508 uninstall-coinlibLTLIBRARIES:
     506uninstall-libLTLIBRARIES:
    509507        @$(NORMAL_UNINSTALL)
    510         @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     508        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    511509          p=$(am__strip_dir) \
    512           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
    513           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
     510          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     511          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    514512        done
    515513
    516 clean-coinlibLTLIBRARIES:
    517         -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
    518         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     514clean-libLTLIBRARIES:
     515        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     516        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    519517          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    520518          test "$$dir" != "$$p" || dir=.; \
    … …  
    523521        done
    524522libOsiCbc.la: $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_DEPENDENCIES)
    525         $(CXXLINK) -rpath $(coinlibdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS)
     523        $(CXXLINK) -rpath $(libdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS)
    526524
    527525mostlyclean-compile:
    … …  
    660658all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    661659installdirs:
    662         for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \
     660        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
    663661          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    664662        done
    … …  
    689687clean: clean-am
    690688
    691 clean-am: clean-coinlibLTLIBRARIES clean-generic clean-libtool \
     689clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    692690        mostlyclean-am
    693691
    … …  
    708706info-am:
    709707
    710 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
    711 
    712 install-exec-am:
     708install-data-am: install-includecoinHEADERS
     709
     710install-exec-am: install-libLTLIBRARIES
    713711
    714712install-info: install-info-am
    … …  
    736734ps-am:
    737735
    738 uninstall-am: uninstall-coinlibLTLIBRARIES \
    739         uninstall-includecoinHEADERS uninstall-info-am
    740 
    741 .PHONY: CTAGS GTAGS all all-am check check-am clean \
    742         clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
    743         distclean distclean-compile distclean-generic \
    744         distclean-libtool distclean-tags distdir dvi dvi-am html \
    745         html-am info info-am install install-am \
    746         install-coinlibLTLIBRARIES install-data install-data-am \
    747         install-exec install-exec-am install-includecoinHEADERS \
    748         install-info install-info-am install-man install-strip \
    749         installcheck installcheck-am installdirs maintainer-clean \
    750         maintainer-clean-generic mostlyclean mostlyclean-compile \
    751         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    752         tags uninstall uninstall-am uninstall-coinlibLTLIBRARIES \
    753         uninstall-includecoinHEADERS uninstall-info-am
     736uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
     737        uninstall-libLTLIBRARIES
     738
     739.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     740        clean-libLTLIBRARIES clean-libtool ctags distclean \
     741        distclean-compile distclean-generic distclean-libtool \
     742        distclean-tags distdir dvi dvi-am html html-am info info-am \
     743        install install-am install-data install-data-am install-exec \
     744        install-exec-am install-includecoinHEADERS install-info \
     745        install-info-am install-libLTLIBRARIES install-man \
     746        install-strip installcheck installcheck-am installdirs \
     747        maintainer-clean maintainer-clean-generic mostlyclean \
     748        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     749        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     750        uninstall-includecoinHEADERS uninstall-info-am \
     751        uninstall-libLTLIBRARIES
    754752
    755753# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.