Changeset a5121bf for automake/cfa.m4

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:

• automake/cfa.m4 (modified) (1 diff)

automake/cfa.m4

@@ -26 +26 @@
 
         if test "$libdir" = '${exec_prefix}/lib'; then
-                cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
+                if test "${ARCHITECTURE}" != ""; then
+                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+                else
+                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+                fi
         else
                 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"