ooo-build r12958 - in trunk: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jun 25 01:21:35 2008
New Revision: 12958
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12958&view=rev

Log:
2008-06-25  Rene Engelhard  <rene debian org>
        
        * bin/install-mono: update for solenv-installer-cleaner-paths.diff
          (revert commit from 2008-06-21) and add some more needed basis3.0's


Modified:
   trunk/ChangeLog
   trunk/bin/install-mono

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Wed Jun 25 01:21:35 2008
@@ -40,8 +40,8 @@
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
 	$SRCDIR/$dll.config.in >$OOINSTDIR/basis$VERSION/program/$dll.config
     if test -n "$OODESTDIR" ; then
-	file_list=`grep "^$OOINSTBASE/./basis$VERSION/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
-	echo "$OOINSTBASE/./basis$VERSION/program/$dll.config" >>$file_list
+	file_list=`grep "^$OOINSTBASE/basis$VERSION/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+	echo "$OOINSTBASE/basis$VERSION/program/$dll.config" >>$file_list
     fi
 done
 
@@ -58,15 +58,15 @@
 	gacutil $gacutil_root -i $OOINSTDIR/program/$dll -package $OOOINSTALLDIRNAME || exit 0
 
 	# the original fixes are not longer needed
-	rm -f $OOINSTDIR/program/$dll
-	rm -f $OOINSTDIR/program/$dll.config
+	rm -f $OOINSTDIR/basis3.0/program/$dll
+	rm -f $OOINSTDIR/basis3.0/program/$dll.config
 
 	# remove the deleted fixes from the filelist
 	if test -n "$OODESTDIR" ; then
 	    file_list=`grep "^$OOINSTBASE/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
 	    test -z "$file_list" && echo "Error: \"$OOINSTBASE/program/$dll\" has not found in any filelist" && exit 1;
-	    sed -e "s|^$OOINSTBASE/program/$dll$||" \
-	        -e "s|^$OOINSTBASE/program/$dll.config$||" \
+	    sed -e "s|^$OOINSTBASE/basis3.0/program/$dll$||" \
+	        -e "s|^$OOINSTBASE/basis3.0/program/$dll.config$||" \
 		$file_list >$file_list.mono
 	    mv $file_list.mono $file_list
 	fi