Changeset 911


Ignore:
Timestamp:
Jan 2, 2011 9:36:15 AM (11 years ago)
Author:
stefan
Message:

change library installation directory back to

Location:
trunk/Cgl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cgl/cgl.pc.in

    r909 r911  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55
  • trunk/Cgl/src/Makefile.am

    r908 r911  
    1717
    1818# Name of the library compiled in this directory.  We want it to be installed
    19 # in the 'lib/coin' directory
    20 libcoindir = $(libdir)/coin
    21 libcoin_LTLIBRARIES = libCgl.la
     19# in the $libdir directory
     20lib_LTLIBRARIES = libCgl.la
    2221
    2322# List all source files for this library, including headers
  • trunk/Cgl/src/Makefile.in

    r909 r911  
    6161  esac;
    6262am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    63 am__installdirs = "$(DESTDIR)$(libcoindir)" \
    64         "$(DESTDIR)$(includecoindir)"
    65 libcoinLTLIBRARIES_INSTALL = $(INSTALL)
    66 LTLIBRARIES = $(libcoin_LTLIBRARIES)
     63am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
     64libLTLIBRARIES_INSTALL = $(INSTALL)
     65LTLIBRARIES = $(lib_LTLIBRARIES)
    6766am__DEPENDENCIES_1 =
    6867am_libCgl_la_OBJECTS = CglCutGenerator.lo CglMessage.lo CglStored.lo \
     
    368367
    369368# Name of the library compiled in this directory.  We want it to be installed
    370 # in the 'lib/coin' directory
    371 libcoindir = $(libdir)/coin
    372 libcoin_LTLIBRARIES = libCgl.la
     369# in the $libdir directory
     370lib_LTLIBRARIES = libCgl.la
    373371
    374372# List all source files for this library, including headers
     
    458456$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    459457        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    460 install-libcoinLTLIBRARIES: $(libcoin_LTLIBRARIES)
     458install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    461459        @$(NORMAL_INSTALL)
    462         test -z "$(libcoindir)" || $(mkdir_p) "$(DESTDIR)$(libcoindir)"
    463         @list='$(libcoin_LTLIBRARIES)'; for p in $$list; do \
     460        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     461        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    464462          if test -f $$p; then \
    465463            f=$(am__strip_dir) \
    466             echo " $(LIBTOOL) --mode=install $(libcoinLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libcoindir)/$$f'"; \
    467             $(LIBTOOL) --mode=install $(libcoinLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libcoindir)/$$f"; \
     464            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     465            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    468466          else :; fi; \
    469467        done
    470468
    471 uninstall-libcoinLTLIBRARIES:
     469uninstall-libLTLIBRARIES:
    472470        @$(NORMAL_UNINSTALL)
    473         @set -x; list='$(libcoin_LTLIBRARIES)'; for p in $$list; do \
     471        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    474472          p=$(am__strip_dir) \
    475           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libcoindir)/$$p'"; \
    476           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libcoindir)/$$p"; \
    477         done
    478 
    479 clean-libcoinLTLIBRARIES:
    480         -test -z "$(libcoin_LTLIBRARIES)" || rm -f $(libcoin_LTLIBRARIES)
    481         @list='$(libcoin_LTLIBRARIES)'; for p in $$list; do \
     473          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     474          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
     475        done
     476
     477clean-libLTLIBRARIES:
     478        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     479        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    482480          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    483481          test "$$dir" != "$$p" || dir=.; \
     
    486484        done
    487485libCgl.la: $(libCgl_la_OBJECTS) $(libCgl_la_DEPENDENCIES)
    488         $(CXXLINK) -rpath $(libcoindir) $(libCgl_la_LDFLAGS) $(libCgl_la_OBJECTS) $(libCgl_la_LIBADD) $(LIBS)
     486        $(CXXLINK) -rpath $(libdir) $(libCgl_la_LDFLAGS) $(libCgl_la_OBJECTS) $(libCgl_la_LIBADD) $(LIBS)
    489487
    490488mostlyclean-compile:
     
    728726installdirs: installdirs-recursive
    729727installdirs-am:
    730         for dir in "$(DESTDIR)$(libcoindir)" "$(DESTDIR)$(includecoindir)"; do \
     728        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
    731729          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    732730        done
     
    757755clean: clean-recursive
    758756
    759 clean-am: clean-generic clean-libcoinLTLIBRARIES clean-libtool \
     757clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    760758        mostlyclean-am
    761759
     
    776774info-am:
    777775
    778 install-data-am: install-includecoinHEADERS install-libcoinLTLIBRARIES
    779 
    780 install-exec-am: install-exec-local
     776install-data-am: install-includecoinHEADERS
     777
     778install-exec-am: install-exec-local install-libLTLIBRARIES
    781779
    782780install-info: install-info-recursive
     
    805803
    806804uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
    807         uninstall-libcoinLTLIBRARIES uninstall-local
     805        uninstall-libLTLIBRARIES uninstall-local
    808806
    809807uninstall-info: uninstall-info-recursive
    810808
    811809.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    812         clean clean-generic clean-libcoinLTLIBRARIES clean-libtool \
     810        clean clean-generic clean-libLTLIBRARIES clean-libtool \
    813811        clean-recursive ctags ctags-recursive distclean \
    814812        distclean-compile distclean-generic distclean-libtool \
     
    817815        install-data-am install-exec install-exec-am \
    818816        install-exec-local install-includecoinHEADERS install-info \
    819         install-info-am install-libcoinLTLIBRARIES install-man \
     817        install-info-am install-libLTLIBRARIES install-man \
    820818        install-strip installcheck installcheck-am installdirs \
    821819        installdirs-am maintainer-clean maintainer-clean-generic \
     
    824822        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
    825823        uninstall-includecoinHEADERS uninstall-info-am \
    826         uninstall-libcoinLTLIBRARIES uninstall-local
     824        uninstall-libLTLIBRARIES uninstall-local
    827825
    828826
Note: See TracChangeset for help on using the changeset viewer.