Changeset 1568 for trunk/Cbc/src/Makefile.in

Timestamp:

Jan 2, 2011 10:05:27 AM (10 years ago)

Author:

stefan

Message:

change library installation directory back to

File:

• trunk/Cbc/src/Makefile.in (modified) (8 diffs)

trunk/Cbc/src/Makefile.in

@@ -84 +84 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
         "$(DESTDIR)$(includecoindir)"
-coinlibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(coinlib_LTLIBRARIES)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libCbc_la_LIBADD =
 am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
@@ -512 +512 @@
 # Name of the library compiled in this directory.  We want it to be installed
 # in the 'lib' directory
-coinlibdir = ${libdir}/coin
-coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
+lib_LTLIBRARIES = libCbc.la libCbcSolver.la
 
 # List all source files for this library, including headers
@@ -770 +769 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
         @$(NORMAL_INSTALL)
-        test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
-        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
+        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           if test -f $$p; then \
             f=$(am__strip_dir) \
-            echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
-            $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
+            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
           else :; fi; \
         done
 
-uninstall-coinlibLTLIBRARIES:
+uninstall-libLTLIBRARIES:
         @$(NORMAL_UNINSTALL)
-        @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
+        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           p=$(am__strip_dir) \
-          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
-          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
+          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
         done
 
-clean-coinlibLTLIBRARIES:
-        -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
-        @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
           test "$$dir" != "$$p" || dir=.; \
@@ -798 +797 @@
         done
 libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES) 
-        $(CXXLINK) -rpath $(coinlibdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
+        $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)
 libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES) 
-        $(CXXLINK) -rpath $(coinlibdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
+        $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
@@ -1154 +1153 @@
 check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
 installdirs: installdirs-recursive
 installdirs-am:
-        for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -1185 +1186 @@
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
         clean-libtool mostlyclean-am
 
@@ -1204 +1205 @@
 info-am:
 
-install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
-
-install-exec-am: install-binPROGRAMS install-exec-local
+install-data-am: install-includecoinHEADERS
+
+install-exec-am: install-binPROGRAMS install-exec-local \
+        install-libLTLIBRARIES
 
 install-info: install-info-recursive
@@ -1232 +1234 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
-        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \
+        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-        clean clean-binPROGRAMS clean-coinlibLTLIBRARIES clean-generic \
+        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
         clean-libtool clean-recursive ctags ctags-recursive distclean \
         distclean-compile distclean-generic distclean-libtool \
         distclean-recursive distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-binPROGRAMS \
-        install-coinlibLTLIBRARIES install-data install-data-am \
-        install-exec install-exec-am install-exec-local \
-        install-includecoinHEADERS install-info install-info-am \
-        install-man install-strip installcheck installcheck-am \
-        installdirs installdirs-am maintainer-clean \
-        maintainer-clean-generic maintainer-clean-recursive \
-        mostlyclean mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-        tags tags-recursive uninstall uninstall-am \
-        uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \
-        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
+        install-data install-data-am install-exec install-exec-am \
+        install-exec-local install-includecoinHEADERS install-info \
+        install-info-am install-libLTLIBRARIES install-man \
+        install-strip installcheck installcheck-am installdirs \
+        installdirs-am maintainer-clean maintainer-clean-generic \
+        maintainer-clean-recursive mostlyclean mostlyclean-compile \
+        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
+        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local