Changeset 14b253d for configure

Timestamp:

Aug 15, 2018, 11:22:23 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3de9135

Parents:

636e1b9 (diff), bdff89d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• configure (modified) (5 diffs)

configure

@@ -3235 +3235 @@
                 cfa_prefix=${prefix}
         fi
-        cfa_prefix="$(readlink -f ${cfa_prefix})/"
+        cfa_prefix="$(readlink -m ${cfa_prefix})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3245 +3245 @@
 
         if test "$includedir" = '${prefix}/include'; then
-                cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+                cfa_incdir="${cfa_prefix}include/${cfa_name}"
         else
                 cfa_incdir=${includedir}
         fi
-        cfa_incdir="$(readlink -f ${cfa_incdir})/"
+        cfa_incdir="$(readlink -m ${cfa_incdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3259 +3259 @@
 
         if test "$bindir" = '${exec_prefix}/bin'; then
-                cfa_bindir="${cfa_prefix}/bin"
+                cfa_bindir="${cfa_prefix}bin"
         else
                 cfa_bindir=${bindir}
         fi
-        cfa_bindir="$(readlink -f ${cfa_bindir})/"
+        cfa_bindir="$(readlink -m ${cfa_bindir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3274 +3274 @@
         if test "$libdir" = '${exec_prefix}/lib'; then
                 if test "${ARCHITECTURE}" != ""; then
-                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
                 else
-                        cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+                        cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
                 fi
         else
                 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
-        cfa_libdir="$(readlink -f ${cfa_libdir})/"
+        cfa_libdir="$(readlink -m ${cfa_libdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3294 +3294 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
-TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
+TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"