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

Timestamp:

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

Author:

stefan

Message:

change library installation directory back to

File:

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

trunk/Cbc/src/OsiCbc/Makefile.in

@@ -71 +71 @@
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(coinlibdir)" \
-        "$(DESTDIR)$(includecoindir)"
-coinlibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(coinlib_LTLIBRARIES)
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libOsiCbc_la_LIBADD =
 am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
@@ -430 +429 @@
 
 # Name of the library compiled in this directory.
-coinlibdir = ${libdir}/coin
-coinlib_LTLIBRARIES = libOsiCbc.la
+lib_LTLIBRARIES = libOsiCbc.la
 
 # List all source files for this library, including headers
@@ -495 +493 @@
 $(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=.; \
@@ -523 +521 @@
         done
 libOsiCbc.la: $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_DEPENDENCIES) 
-        $(CXXLINK) -rpath $(coinlibdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS)
+        $(CXXLINK) -rpath $(libdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -660 +658 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \
+        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -689 +687 @@
 clean: clean-am
 
-clean-am: clean-coinlibLTLIBRARIES clean-generic clean-libtool \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
         mostlyclean-am
 
@@ -708 +706 @@
 info-am:
 
-install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
-
-install-exec-am:
+install-data-am: install-includecoinHEADERS
+
+install-exec-am: install-libLTLIBRARIES
 
 install-info: install-info-am
@@ -736 +734 @@
 ps-am:
 
-uninstall-am: uninstall-coinlibLTLIBRARIES \
-        uninstall-includecoinHEADERS uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean \
-        clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
-        distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am \
-        install-coinlibLTLIBRARIES install-data install-data-am \
-        install-exec install-exec-am install-includecoinHEADERS \
-        install-info install-info-am install-man install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am uninstall-coinlibLTLIBRARIES \
-        uninstall-includecoinHEADERS uninstall-info-am
+uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
+        uninstall-libLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+        clean-libLTLIBRARIES clean-libtool ctags distclean \
+        distclean-compile distclean-generic distclean-libtool \
+        distclean-tags distdir dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-exec \
+        install-exec-am install-includecoinHEADERS install-info \
+        install-info-am install-libLTLIBRARIES install-man \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+        pdf pdf-am ps ps-am tags uninstall uninstall-am \
+        uninstall-includecoinHEADERS uninstall-info-am \
+        uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.