Changeset 2ea0a8a

Timestamp:

Aug 10, 2018, 3:48:29 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:

47c1928

Parents:

0c1b566

Message:

Some more cannonical paths

Files:

• automake/cfa.m4 (modified) (4 diffs)
• configure (modified) (5 diffs)
• configure.ac (modified) (1 diff)

automake/cfa.m4

@@ -6 +6 @@
                 cfa_prefix=${prefix}
         fi
+        cfa_prefix="$(readlink -f ${cfa_prefix})/"
         AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
         AC_SUBST(CFA_PREFIX, ${cfa_prefix})
@@ -14 +15 @@
                 cfa_incdir=${includedir}
         fi
+        cfa_incdir="$(readlink -f ${cfa_incdir})/"
         AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
         AC_SUBST(CFA_INCDIR, ${cfa_incdir})
@@ -22 +24 @@
                 cfa_bindir=${bindir}
         fi
+        cfa_bindir="$(readlink -f ${cfa_bindir})/"
         AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
         AC_SUBST(CFA_BINDIR, ${cfa_bindir})
@@ -34 +37 @@
                 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
+        cfa_libdir="$(readlink -f ${cfa_libdir})/"
         AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
         AC_SUBST(CFA_LIBDIR, ${cfa_libdir})

configure

@@ -3234 +3234 @@
                 cfa_prefix=${prefix}
         fi
+        cfa_prefix="$(readlink -f ${cfa_prefix})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3247 +3248 @@
                 cfa_incdir=${includedir}
         fi
+        cfa_incdir="$(readlink -f ${cfa_incdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3260 +3262 @@
                 cfa_bindir=${bindir}
         fi
+        cfa_bindir="$(readlink -f ${cfa_bindir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3277 +3280 @@
                 cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
+        cfa_libdir="$(readlink -f ${cfa_libdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3289 +3293 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR=$(readlink -f $ac_confdir/)
-TOP_BUILDDIR=$(readlink -f $ac_pwd/)
-
-echo ${TOP_SRCDIR}
-echo ${TOP_BUILDDIR}
+TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
 
 

configure.ac

@@ -80 +80 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR=$(readlink -f $ac_confdir/)
-TOP_BUILDDIR=$(readlink -f $ac_pwd/)
-
-echo ${TOP_SRCDIR}
-echo ${TOP_BUILDDIR}
+TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
 
 AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])