Changeset 2710


Ignore:
Timestamp:
Feb 18, 2013 1:21:46 AM (7 years ago)
Author:
lou
Message:

Revisions to CxxTest? installation.

Location:
ThirdParty/CxxTest/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/CxxTest/trunk/Makefile.am

    r2707 r2710  
    1919cxxinc_DATA = $(CXXTESTHDRS)
    2020
    21 # Install cxxtestgen in the bin directory
     21# Install cxxtestgen in the bin directory. The hook will edit it so that it
     22# can find its modules in libdir/cxxtest/python.
    2223
    2324bin_SCRIPTS = cxxtest/bin/cxxtestgen
     25
     26install-exec-hook:
     27        cd $(bindir) && \
     28        sed -i -e "/sys.path.insert/s/os.sep/os.sep+'lib'+os.sep+'cxxtest'+os.sep/" cxxtestgen
    2429
    2530# Copy the cxxtest/python subdirectory into $(libdir)/cxxtest
    2631
    2732install-exec-local:
     33        $(INSTALL) -d $(libdir)/cxxtest
    2834        cp -r $(srcdir)/cxxtest/python $(libdir)/cxxtest
    2935
  • ThirdParty/CxxTest/trunk/Makefile.in

    r2709 r2710  
    245245cxxinc_DATA = $(CXXTESTHDRS)
    246246
    247 # Install cxxtestgen in the bin directory
     247# Install cxxtestgen in the bin directory. The hook will edit it so that it
     248# can find its modules in libdir/cxxtest/python.
    248249bin_SCRIPTS = cxxtest/bin/cxxtestgen
    249250
     
    543544
    544545install-exec-am: install-binSCRIPTS install-exec-local
     546        @$(NORMAL_INSTALL)
     547        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    545548
    546549install-info: install-info-am
     
    577580        dvi dvi-am html html-am info info-am install install-am \
    578581        install-binSCRIPTS install-cxxincDATA install-data \
    579         install-data-am install-exec install-exec-am \
     582        install-data-am install-exec install-exec-am install-exec-hook \
    580583        install-exec-local install-info install-info-am install-man \
    581584        install-pkgconfiglibDATA install-strip installcheck \
     
    587590
    588591
     592install-exec-hook:
     593        cd $(bindir) && \
     594        sed -i -e "/sys.path.insert/s/os.sep/os.sep+'lib'+os.sep+'cxxtest'+os.sep/" cxxtestgen
     595
    589596# Copy the cxxtest/python subdirectory into $(libdir)/cxxtest
    590597
    591598install-exec-local:
     599        $(INSTALL) -d $(libdir)/cxxtest
    592600        cp -r $(srcdir)/cxxtest/python $(libdir)/cxxtest
    593601
  • ThirdParty/CxxTest/trunk/coincxxtest.pc.in

    r2707 r2710  
    22exec_prefix=@exec_prefix@
    33libdir=@libdir@
    4 includedir=@includedir@/coin/ThirdParty/CxxTest
     4includedir=@includedir@/coin/ThirdParty
    55bindir=@prefix@/bin
    66
Note: See TracChangeset for help on using the changeset viewer.