Changeset 1469


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

change library installation directory back to

Location:
Alps/trunk/Alps
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Alps/trunk/Alps/alps.pc.in

    r1467 r1469  
    11prefix=@prefix@
    22exec_prefix=@exec_prefix@
    3 libdir=@libdir@/coin
     3libdir=@libdir@
    44includedir=@includedir@/coin
    55
  • Alps/trunk/Alps/src/Makefile.am

    r1456 r1469  
    1313########################################################################
    1414
    15 coinlibdir = ${libdir}/coin
    1615# Name of the library compiled in this directory.
    17 coinlib_LTLIBRARIES = libAlps.la
     16lib_LTLIBRARIES = libAlps.la
    1817
    1918# List all source files for this library, including headers
  • Alps/trunk/Alps/src/Makefile.in

    r1467 r1469  
    6666  esac;
    6767am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    68 am__installdirs = "$(DESTDIR)$(coinlibdir)" \
    69         "$(DESTDIR)$(includecoindir)"
    70 coinlibLTLIBRARIES_INSTALL = $(INSTALL)
    71 LTLIBRARIES = $(coinlib_LTLIBRARIES)
     68am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
     69libLTLIBRARIES_INSTALL = $(INSTALL)
     70LTLIBRARIES = $(lib_LTLIBRARIES)
    7271libAlps_la_LIBADD =
    7372am__libAlps_la_SOURCES_DIST = AlpsConfig.h AlpsAix43.h \
     
    302301#                               libAlps                                #
    303302########################################################################
    304 coinlibdir = ${libdir}/coin
     303
    305304# Name of the library compiled in this directory.
    306 coinlib_LTLIBRARIES = libAlps.la
     305lib_LTLIBRARIES = libAlps.la
    307306
    308307# List all source files for this library, including headers
     
    410409$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    411410        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    412 install-coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)
     411install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    413412        @$(NORMAL_INSTALL)
    414         test -z "$(coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"
    415         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     413        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     414        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    416415          if test -f $$p; then \
    417416            f=$(am__strip_dir) \
    418             echo " $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \
    419             $(LIBTOOL) --mode=install $(coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \
     417            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     418            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    420419          else :; fi; \
    421420        done
    422421
    423 uninstall-coinlibLTLIBRARIES:
     422uninstall-libLTLIBRARIES:
    424423        @$(NORMAL_UNINSTALL)
    425         @set -x; list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     424        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    426425          p=$(am__strip_dir) \
    427           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coinlibdir)/$$p'"; \
    428           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coinlibdir)/$$p"; \
     426          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     427          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    429428        done
    430429
    431 clean-coinlibLTLIBRARIES:
    432         -test -z "$(coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)
    433         @list='$(coinlib_LTLIBRARIES)'; for p in $$list; do \
     430clean-libLTLIBRARIES:
     431        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     432        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    434433          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    435434          test "$$dir" != "$$p" || dir=.; \
     
    438437        done
    439438libAlps.la: $(libAlps_la_OBJECTS) $(libAlps_la_DEPENDENCIES)
    440         $(CXXLINK) -rpath $(coinlibdir) $(libAlps_la_LDFLAGS) $(libAlps_la_OBJECTS) $(libAlps_la_LIBADD) $(LIBS)
     439        $(CXXLINK) -rpath $(libdir) $(libAlps_la_LDFLAGS) $(libAlps_la_OBJECTS) $(libAlps_la_LIBADD) $(LIBS)
    441440
    442441mostlyclean-compile:
     
    586585all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    587586installdirs:
    588         for dir in "$(DESTDIR)$(coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \
     587        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
    589588          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    590589        done
     
    615614clean: clean-am
    616615
    617 clean-am: clean-coinlibLTLIBRARIES clean-generic clean-libtool \
     616clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
    618617        mostlyclean-am
    619618
     
    634633info-am:
    635634
    636 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS
    637 
    638 install-exec-am: install-exec-local
     635install-data-am: install-includecoinHEADERS
     636
     637install-exec-am: install-exec-local install-libLTLIBRARIES
    639638
    640639install-info: install-info-am
     
    662661ps-am:
    663662
    664 uninstall-am: uninstall-coinlibLTLIBRARIES \
    665         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    666 
    667 .PHONY: CTAGS GTAGS all all-am check check-am clean \
    668         clean-coinlibLTLIBRARIES clean-generic clean-libtool ctags \
    669         distclean distclean-compile distclean-generic \
    670         distclean-libtool distclean-tags distdir dvi dvi-am html \
    671         html-am info info-am install install-am \
    672         install-coinlibLTLIBRARIES install-data install-data-am \
    673         install-exec install-exec-am install-exec-local \
    674         install-includecoinHEADERS install-info install-info-am \
     663uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
     664        uninstall-libLTLIBRARIES uninstall-local
     665
     666.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     667        clean-libLTLIBRARIES clean-libtool ctags distclean \
     668        distclean-compile distclean-generic distclean-libtool \
     669        distclean-tags distdir dvi dvi-am html html-am info info-am \
     670        install install-am install-data install-data-am install-exec \
     671        install-exec-am install-exec-local install-includecoinHEADERS \
     672        install-info install-info-am install-libLTLIBRARIES \
    675673        install-man install-strip installcheck installcheck-am \
    676674        installdirs maintainer-clean maintainer-clean-generic \
    677675        mostlyclean mostlyclean-compile mostlyclean-generic \
    678676        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    679         uninstall-am uninstall-coinlibLTLIBRARIES \
    680         uninstall-includecoinHEADERS uninstall-info-am uninstall-local
     677        uninstall-am uninstall-includecoinHEADERS uninstall-info-am \
     678        uninstall-libLTLIBRARIES uninstall-local
    681679
    682680
Note: See TracChangeset for help on using the changeset viewer.