ooo-build r11566 - in trunk: . bin src

[pmladek svn gnome org]

Author: pmladek
Date: Wed Feb 13 19:47:56 2008
New Revision: 11566
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11566&view=rev

Log:
2008-02-13  Petr Mladek  <pmladek suse cz>

	* bin/install-mono, configure.in, src/cli_cppuhelper.dll.config.in,
	  src/cli_uno_bridge.dll.config.in: substitute the libdir correctly
	  even when --libdir is not used; the substitution is being done by
	  the install-mono script now



Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/configure.in
   trunk/src/cli_cppuhelper.dll.config.in
   trunk/src/cli_uno_bridge.dll.config.in

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Wed Feb 13 19:47:56 2008
@@ -31,11 +31,14 @@
 # the /usr/lib paths; the .pc file itself must be in the arch dependant path
 # to be found in PKG_CONFIG_PATH, though
 mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
-cp $SRCDIR/mono-ooo.pc ${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
+sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+    $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
-    cp $SRCDIR/$dll.config $OOINSTDIR/program/
+    sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
+	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
+	$SRCDIR/$dll.config.in >$OOINSTDIR/program/$dll.config
     if test -n "$OODESTDIR" ; then
 	file_list=`grep "^$OOINSTBASE/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
 	echo "$OOINSTBASE/program/$dll.config" >>$file_list

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 13 19:47:56 2008
@@ -1201,9 +1201,6 @@
 po/Makefile
 doc/Makefile
 src/Makefile
-src/cli_cppuhelper.dll.config
-src/cli_uno_bridge.dll.config
-src/mono-ooo.pc
 src/layout/Makefile
 src/sdf/Makefile
 stamp/Makefile

Modified: trunk/src/cli_cppuhelper.dll.config.in
==============================================================================
--- trunk/src/cli_cppuhelper.dll.config.in	(original)
+++ trunk/src/cli_cppuhelper.dll.config.in	Wed Feb 13 19:47:56 2008
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="cli_uno_glue" target="@libdir@/@OOOINSTALLDIRNAME@/program/libcli_uno_glue.so"/>
+  <dllmap dll="cli_uno_glue" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libcli_uno_glue.so"/>
 </configuration>

Modified: trunk/src/cli_uno_bridge.dll.config.in
==============================================================================
--- trunk/src/cli_uno_bridge.dll.config.in	(original)
+++ trunk/src/cli_uno_bridge.dll.config.in	Wed Feb 13 19:47:56 2008
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap dll="cli_uno" target="@libdir@/@OOOINSTALLDIRNAME@/program/libcli_uno.so"/>
-  <dllmap dll="sal" target="@libdir@/@OOOINSTALLDIRNAME@/program/libsal.so.3"/>
-  <dllmap dll="uno_cppu" target="@libdir@/@OOOINSTALLDIRNAME@/program/libuno_cppu.so.3"/>
+  <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libcli_uno.so"/>
+  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libsal.so"/>
+  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/program/libuno_cppu.so"/>
 </configuration>