Changeset a5121bf for configure


Ignore:
Timestamp:
Aug 7, 2018, 3:23:34 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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
  • configure

    r524ed86 ra5121bf  
    32663266
    32673267        if test "$libdir" = '${exec_prefix}/lib'; then
    3268                 cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
     3268                if test "${ARCHITECTURE}" != ""; then
     3269                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
     3270                else
     3271                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
     3272                fi
    32693273        else
    32703274                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
     
    34503454
    34513455        lib_arch=${cannon_arch_name}
    3452         lib_dir="libcfa-${lib_arch}-${lib_config}"
     3456        lib_dir="libcfa/${lib_arch}-${lib_config}"
    34533457
    34543458        LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
    34553459        LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
    34563460
    3457         mkdir -p libcfa-${lib_arch}-${lib_config}
    3458         echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
    3459         echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
    3460         echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
    3461         echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
     3461        mkdir -p ${lib_dir}
     3462        echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
     3463        echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
     3464        echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
     3465        echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data
    34623466done
    34633467
Note: See TracChangeset for help on using the changeset viewer.