ooo-build r14808 - in trunk: . bin

[strba svn gnome org]

Author: strba
Date: Wed Dec 10 12:22:36 2008
New Revision: 14808
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14808&view=rev

Log:
2008-12-10  Fridrich Strba  <fridrich strba bluewin ch>
	* bin/ooinstall: make "make install" work with internal python too.
	* bin/install-mono: some $SRCDIR -> $TOOLSDIR/src missmatch.


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

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Wed Dec 10 12:22:36 2008
@@ -44,14 +44,14 @@
 # to be found in PKG_CONFIG_PATH, though
 mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
 sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
-    $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
+    $TOOLSDIR/src/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
 test "$split_build" = "yes" && echo ${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc >>$MONOGACFILELIST
 
 # extra dlls config files
 for dll in cli_uno_bridge.dll ; do
     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
-	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
+	$TOOLSDIR/src/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
     if test -n "$OODESTDIR" ; then
 	file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
 	echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Wed Dec 10 12:22:36 2008
@@ -77,7 +77,17 @@
 }
 
 # Workaround for the Python
-$configure_vars{'PYTHONPATH'} = "$setup_vars{'OOBUILDDIR'}/instsetoo_native/$configure_vars{'INPATH'}/bin:$configure_vars{'SOLARVERSION'}/$configure_vars{'INPATH'}/lib";
+if ( $configure_vars{'SYSTEM_PYTHON'} eq 'YES' ) {
+    $configure_vars{'PYTHONPATH'} = "$setup_vars{'OOBUILDDIR'}/instsetoo_native/$configure_vars{'INPATH'}/bin:$configure_vars{'SOLARVERSION'}/$configure_vars{'INPATH'}/lib";
+}
+else {
+   my @pythonsubstitutions = ( 'PYTHONPATH', 'PYTHONHOME' );
+   for my $pythonsubst (@pythonsubstitutions) {
+       for my $pythonkey (keys %configure_vars) {
+	   $configure_vars{$pythonkey} =~ s/\$$pythonsubst/$configure_vars{$pythonsubst}/g;
+       }
+   }    
+}
 
 for $arg (@ARGV) {
     if ($arg eq '-l') {