ooo-build r13440 - in trunk: . bin src

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jul 30 18:43:51 2008
New Revision: 13440
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13440&view=rev

Log:
2008-07-30  Rene Engelhard  <rene debian org>

        * src/cli_cppuhelper.dll.config.in: remove
        * src/Makefile.am: remove cli_cppuhelper.dll.config.in
        * bin/install-mono: add stuff from src/cli_cppuhelper.dll.config.in to
          upstream-built .config


Removed:
   trunk/src/cli_cppuhelper.dll.config.in
Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/src/Makefile.am

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Wed Jul 30 18:43:51 2008
@@ -35,15 +35,13 @@
     $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
 
 # extra dlls config files
-for dll in cli_cppuhelper.dll cli_uno_bridge.dll ; do
+for dll in cli_uno_bridge.dll ; do
     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
 	-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
-    fi
 done
+	perl -pi -e "s,</configuration>,  <dllmap dll=\"cli_uno_glue\" target=\"$LIBDIRBASE/$OOOINSTALLDIRNAME/ure-link/lib/libcli_uno_glue.so\"/>\n</configuration>," \
+		$OOINSTDIR/ure/lib/cli_cppuhelper.config
 
 # install versioned assemblies into the system Global Assembly Cache  (GAC)
 # to  become  part  of  the assemblies that are available for all applications

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jul 30 18:43:51 2008
@@ -5,7 +5,6 @@
 	Novell.dic \
 	Ubuntu.dic \
 	banner_nld.bmp \
-	cli_cppuhelper.dll.config.in \
 	cli_uno_bridge.dll.config.in \
 	mono-ooo.pc.in \
 	nologoinstall_nld.bmp \