postprocess/packconfig/packconfig.pl | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 5f632a87abd256e608cf568d035130c2cb19f4d3
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Mar 1 12:16:45 2013 +0200
Don't scribble into SRCDIR
Change-Id: I923a3dfe59bf4a16700c23bc22d14e3393f77b15
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index 372ba5e..0ce653d 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -217,12 +217,11 @@ sub create_zip_archive
print_message("creating config archive ...") if $verbose;
my $zip = Archive::Zip->new();
- # on Mac OS X Intel we have unxmacxi.pro, on Mac OS X PowerPC unxmacxp.pro
.. and so on
my $platform = $ENV{INPATH};
foreach ( sort keys %{$zip_hash_ref} ) {
my $path = "$files_path/$_";
- # only Mac OS X Aqua is concerned here
+ # only Mac OS X is concerned here
# but changes for other platforms can easely be added following the same
principle
if ( ( $platform =~ /^.*macx*/) && ($path =~ /^.*menubar.xml/ ) ) {
$path = modify_mac_menus($path);
@@ -241,10 +240,7 @@ sub create_zip_archive
sub modify_mac_menus
{
- my $path_base = "$ENV{'SOLARENV'}";
- $path_base =~ s/solenv//;
-
- my $new_file_name =
"$path_base"."postprocess"."\/"."$ENV{INPATH}"."\/"."misc"."\/"."$_";
+ my $new_file_name = "$ENV{'WORKDIR'}/CustomTarget/postprocess/misc/$_";
my $new_directory = $new_file_name;
$new_directory =~ s/\/menubar.xml//;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
