Changeset a5121bf for automake


Ignore:
Timestamp:
Aug 7, 2018, 3:23:34 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
575a6e5
Parents:
524ed86
Message:

Tests can now be run from installed binaries or tree binaries

File:
1 edited

Legend:

Unmodified
Added
Removed
  • automake/cfa.m4

    r524ed86 ra5121bf  
    2626
    2727        if test "$libdir" = '${exec_prefix}/lib'; then
    28                 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
     28                if test "${ARCHITECTURE}" != ""; then
     29                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
     30                else
     31                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
     32                fi
    2933        else
    3034                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
Note: See TracChangeset for help on using the changeset viewer.