keep a backup of the erlang sources without mangling around to use fo…

…r subsequent builds, remangle on each build

couchdbx-core-builder.sh

@@ -69,16 +69,17 @@ erlang_install()
     make # can't have -jN so no $MAKEOPTS
     make install
     cd ../../
+    cd dist
+    rm -rf erlang
+    cp -r $ERLANGDISTDIR erlang
+
     touch .erlang-$ERLANG_VERSION-installed
   fi
 }
 
 erlang_post_install()
 {
-  cd dist/
-  cp -r $ERLANGDISTDIR erlang
-  cd $ERLANGDISTDIR
-
+  cd dist/$ERLANGDISTDIR
   # change absolute paths to relative paths
   perl -pi -e "s@$WORKDIR/dist@\`pwd\`@" bin/erl
   # add quotes for paths with spaces
@@ -159,14 +160,11 @@ erlang()
 
 couchdb_download()
 {
-  if [ ! -e .couchdb-downloaded ]; then
     cd src
     if [ ! -d "$COUCHDBSRCDIR" ]; then
       svn checkout http://svn.apache.org/repos/asf/couchdb/$COUCHDB_SVNPATH $COUCHDBSRCDIR
     fi
     cd ..
-    touch .couchdb-downloaded
-  fi
 }
 
 couchdb_install()
@@ -287,16 +285,21 @@ package()
   PACKAGEDIR="couchdbx-core-$ERLANG_VERSION-$COUCHDB_VERSION"
   rm -rf $PACKAGEDIR
   mkdir $PACKAGEDIR
-  cp -r dist/$ERLANGDISTDIR $PACKAGEDIR/erlang
-  cp -r dist/$COUCHDBDISTDIR $PACKAGEDIR/couchdb 
-  cp -r dist/js $PACKAGEDIR
+  cp -r dist/$ERLANGDISTDIR \
+      dist/$COUCHDBDISTDIR \
+      dist/js \
+      $PACKAGEDIR
+  cd $PACKAGEDIR
+  ln -s $COUCHDBDISTDIR couchdb
+  cd ..
   tar czf $PACKAGEDIR.tar.gz $PACKAGEDIR
   # mv $PACKAGEDIR ../couchdbx-dist
   # mv $PACKAGEDIR.tar.gz ../couchdbx-dist
 
   cd dist/
   rm -rf $ERLANGDISTDIR
   mv erlang $ERLANGDISTDIR
+  cd ..
 }
 
 # main: