Tell the 6.6 branch where to find extralibs

diff --git a/darcs-all b/darcs-all
index 186771e..153f007 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -7,9 +7,6 @@ top_dirs="nofib testsuite"
 default_repo_root="http://darcs.haskell.org/ghc-6.6/"
 default_lib_repo_root=$default_repo_root/packages
 
 default_repo_root="http://darcs.haskell.org/ghc-6.6/"
 default_lib_repo_root=$default_repo_root/packages
 

-default_extra_repo_root="http://darcs.haskell.org/"
-default_extra_lib_repo_root=$default_extra_repo_root/packages
-

 quiet=NO
 
 message()
 quiet=NO
 
 message()

@@ -56,27 +53,21 @@ darcsget()
 
   cd libraries
 
 
   cd libraries
 

-  for pkg in `cat core-packages`; do
-    if test -d $pkg; then
-       echo "warning: $pkg already present; omitting"
-    else
-       repo=$lib_repos/$pkg
-       message "== running darcs get --partial $* $repo"
-       darcs get --partial $* $repo
-    fi
-  done
-

   if test "$extra" = "YES"; then
   if test "$extra" = "YES"; then

-  for pkg in `cat extra-packages`; do
+      packages=`cat core-packages extra-packages`
+  else
+      packages=`cat core-packages`
+  fi
+
+  for pkg in $packages; do

     if test -d $pkg; then
        echo "warning: $pkg already present; omitting"
     else
     if test -d $pkg; then
        echo "warning: $pkg already present; omitting"
     else

-       repo=$default_extra_lib_repo_root/$pkg
+       repo=$lib_repos/$pkg

        message "== running darcs get --partial $* $repo"
        darcs get --partial $* $repo
     fi
   done
        message "== running darcs get --partial $* $repo"
        darcs get --partial $* $repo
     fi
   done

-  fi

 }
 
 if test ! -d _darcs -o ! -d compiler; then
 }
 
 if test ! -d _darcs -o ! -d compiler; then