diff -r fafe0dd00c66 -r a53a5e1d61db scripts/build/companion_libs/cloog.sh
--- a/scripts/build/companion_libs/cloog.sh	Sat Sep 12 10:16:28 2009 +0200
+++ b/scripts/build/companion_libs/cloog.sh	Sun Sep 13 12:25:33 2009 +0200
@@ -34,22 +34,31 @@
 }
 
 do_cloog() {
+    local _t
+
+    # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
+    # while versions 0.15.4 onward do have the version in the dirname.
+    case "${CT_CLOOG_VERSION}" in
+        0.15.3) _t="";;
+        *)      _t="-${CT_CLOOG_VERSION}";;
+    esac
+
     mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
     cd "${CT_BUILD_DIR}/build-cloog-ppl"
 
     CT_DoStep INFO "Installing CLooG/ppl"
 
     CT_DoLog EXTRA "Configuring CLooG/ppl"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"      \
-    CT_DoExecLog ALL                    \
-    "${CT_SRC_DIR}/cloog-ppl/configure" \
-        --build=${CT_BUILD}             \
-        --host=${CT_HOST}               \
-        --prefix="${CT_PREFIX_DIR}"     \
-        --with-gmp="${CT_PREFIX_DIR}"   \
-        --with-ppl="${CT_PREFIX_DIR}"   \
-        --enable-shared                 \
-        --disable-static                \
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
+    CT_DoExecLog ALL                            \
+    "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
+        --build=${CT_BUILD}                     \
+        --host=${CT_HOST}                       \
+        --prefix="${CT_PREFIX_DIR}"             \
+        --with-gmp="${CT_PREFIX_DIR}"           \
+        --with-ppl="${CT_PREFIX_DIR}"           \
+        --enable-shared                         \
+        --disable-static                        \
         --with-bits=gmp
 
     CT_DoLog EXTRA "Building CLooG/ppl"