ooo-build r11473 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Wed Jan 30 22:08:49 2008
New Revision: 11473
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11473&view=rev

Log:
2008-01-31  Tor Lillqvist  <tml novell com>

	* patches/src680/store-install.diff
	(solenv/bin/modules/installer/servicesfile.pm): Must pass
	pathnames through fix_cygwin_path(). Unbreaks installer building
	on Windows.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/store-install.diff

Modified: trunk/patches/src680/store-install.diff
==============================================================================
--- trunk/patches/src680/store-install.diff	(original)
+++ trunk/patches/src680/store-install.diff	Wed Jan 30 22:08:49 2008
@@ -38,7 +38,7 @@
  		}
  		else
  		{
-+			system ("$installer::globals::wrapcmd $$regmergefileref -i ${servicesfile}.internal / ${servicesfile}");
++			system ("$installer::globals::wrapcmd $$regmergefileref -i " . fix_cygwin_path ("${servicesfile}.internal") . " / " . fix_cygwin_path (${servicesfile}));
 +			installer::systemactions::rename_one_file ("${servicesfile}.internal", ${servicesfile});
  			$servicesdir = installer::systemactions::rename_directory($servicesdir, $origservicesdir);
  		}