Changeset a5121bf for configure

Timestamp:

Aug 7, 2018, 3:23:34 PM (7 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:

• configure (modified) (2 diffs)

configure

@@ -3266 +3266 @@
 
         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}"
@@ -3450 +3454 @@
 
         lib_arch=${cannon_arch_name}
-        lib_dir="libcfa-${lib_arch}-${lib_config}"
+        lib_dir="libcfa/${lib_arch}-${lib_config}"
 
         LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
         LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
 
-        mkdir -p libcfa-${lib_arch}-${lib_config}
-        echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
-        echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
-        echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
-        echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
+        mkdir -p ${lib_dir}
+        echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
+        echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
+        echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
+        echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data
 done