Changeset 8e485801

Timestamp:

Aug 15, 2018, 11:37:10 AM (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:

7bd4cc9

Parents:

202ad72

Message:

configure no longer requires install directories to exist

Files:

• automake/cfa.m4 (modified) (2 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})/"
+        cfa_prefix="$(readlink -m ${cfa_prefix})/"
         AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
         AC_SUBST(CFA_PREFIX, ${cfa_prefix})
 
         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})/"
         AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
         AC_SUBST(CFA_INCDIR, ${cfa_incdir})
 
         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})/"
         AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
         AC_SUBST(CFA_BINDIR, ${cfa_bindir})
@@ -30 +30 @@
         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})/"
         AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
         AC_SUBST(CFA_LIBDIR, ${cfa_libdir})

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/)/"
 
 

configure.ac ¶

@@ -80 +80 @@
 # 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/)/"
 
 AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])