Changeset 8e48580


Ignore:
Timestamp:
Aug 15, 2018, 11:37:10 AM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
7bd4cc9
Parents:
202ad72
Message:

configure no longer requires install directories to exist

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • automake/cfa.m4

    r202ad72 r8e48580  
    66                cfa_prefix=${prefix}
    77        fi
    8         cfa_prefix="$(readlink -f ${cfa_prefix})/"
     8        cfa_prefix="$(readlink -m ${cfa_prefix})/"
    99        AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
    1010        AC_SUBST(CFA_PREFIX, ${cfa_prefix})
    1111
    1212        if test "$includedir" = '${prefix}/include'; then
    13                 cfa_incdir="${cfa_prefix}/include/${cfa_name}"
     13                cfa_incdir="${cfa_prefix}include/${cfa_name}"
    1414        else
    1515                cfa_incdir=${includedir}
    1616        fi
    17         cfa_incdir="$(readlink -f ${cfa_incdir})/"
     17        cfa_incdir="$(readlink -m ${cfa_incdir})/"
    1818        AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
    1919        AC_SUBST(CFA_INCDIR, ${cfa_incdir})
    2020
    2121        if test "$bindir" = '${exec_prefix}/bin'; then
    22                 cfa_bindir="${cfa_prefix}/bin"
     22                cfa_bindir="${cfa_prefix}bin"
    2323        else
    2424                cfa_bindir=${bindir}
    2525        fi
    26         cfa_bindir="$(readlink -f ${cfa_bindir})/"
     26        cfa_bindir="$(readlink -m ${cfa_bindir})/"
    2727        AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
    2828        AC_SUBST(CFA_BINDIR, ${cfa_bindir})
     
    3030        if test "$libdir" = '${exec_prefix}/lib'; then
    3131                if test "${ARCHITECTURE}" != ""; then
    32                         cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
     32                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
    3333                else
    34                         cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
     34                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
    3535                fi
    3636        else
    3737                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
    3838        fi
    39         cfa_libdir="$(readlink -f ${cfa_libdir})/"
     39        cfa_libdir="$(readlink -m ${cfa_libdir})/"
    4040        AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
    4141        AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
  • configure

    r202ad72 r8e48580  
    32353235                cfa_prefix=${prefix}
    32363236        fi
    3237         cfa_prefix="$(readlink -f ${cfa_prefix})/"
     3237        cfa_prefix="$(readlink -m ${cfa_prefix})/"
    32383238
    32393239cat >>confdefs.h <<_ACEOF
     
    32453245
    32463246        if test "$includedir" = '${prefix}/include'; then
    3247                 cfa_incdir="${cfa_prefix}/include/${cfa_name}"
     3247                cfa_incdir="${cfa_prefix}include/${cfa_name}"
    32483248        else
    32493249                cfa_incdir=${includedir}
    32503250        fi
    3251         cfa_incdir="$(readlink -f ${cfa_incdir})/"
     3251        cfa_incdir="$(readlink -m ${cfa_incdir})/"
    32523252
    32533253cat >>confdefs.h <<_ACEOF
     
    32593259
    32603260        if test "$bindir" = '${exec_prefix}/bin'; then
    3261                 cfa_bindir="${cfa_prefix}/bin"
     3261                cfa_bindir="${cfa_prefix}bin"
    32623262        else
    32633263                cfa_bindir=${bindir}
    32643264        fi
    3265         cfa_bindir="$(readlink -f ${cfa_bindir})/"
     3265        cfa_bindir="$(readlink -m ${cfa_bindir})/"
    32663266
    32673267cat >>confdefs.h <<_ACEOF
     
    32743274        if test "$libdir" = '${exec_prefix}/lib'; then
    32753275                if test "${ARCHITECTURE}" != ""; then
    3276                         cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
     3276                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
    32773277                else
    3278                         cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
     3278                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
    32793279                fi
    32803280        else
    32813281                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
    32823282        fi
    3283         cfa_libdir="$(readlink -f ${cfa_libdir})/"
     3283        cfa_libdir="$(readlink -m ${cfa_libdir})/"
    32843284
    32853285cat >>confdefs.h <<_ACEOF
     
    32943294# Create variables for commonly used targets
    32953295
    3296 TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
    3297 TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
     3296TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
     3297TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"
    32983298
    32993299
  • configure.ac

    r202ad72 r8e48580  
    8080# Create variables for commonly used targets
    8181
    82 TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
    83 TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
     82TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
     83TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"
    8484
    8585AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])
Note: See TracChangeset for help on using the changeset viewer.